fix: simplify some things

Author: serhalp

app/components/Package/Likes.vue

@@ -111,23 +111,16 @@ const likeAction = async () => {
 
   try {
     const result = await togglePackageLike(props.packageName, currentlyLiked, user.value?.handle)
-
-    isLikeActionPending.value = false
-
-    if (result.success) {
-      // Update with server response
-      likesData.value = {
-        ...previousLikesState,
-        ...result.data,
-        topLikedRank: result.data.topLikedRank ?? previousLikesState.topLikedRank,
-      }
-    } else {
-      // Revert on error
-      likesData.value = previousLikesState
-    }
+    likesData.value = result.success
+      ? {
+          ...previousLikesState,
+          ...result.data,
+          topLikedRank: result.data.topLikedRank ?? previousLikesState.topLikedRank,
+        }
+      : previousLikesState
   } catch {
-    // Revert on error
     likesData.value = previousLikesState
+  } finally {
     isLikeActionPending.value = false
   }
 }
@@ -203,7 +196,7 @@ const likeAction = async () => {
 }
 
 @media (prefers-reduced-motion: reduce) {
-  .likeFloat {
+  .like-float {
     display: none;
   }
 }

server/api/leaderboard/likes.get.ts

@@ -3,6 +3,5 @@ import type { LikesLeaderboardEntry } from '#shared/types/social'
 import { getLikesLeaderboard } from '#server/utils/likes-leaderboard'
 
 export default eventHandler(async (event): Promise<LikesLeaderboardEntry[]> => {
-  const leaderboard = await getLikesLeaderboard(event)
-  return leaderboard?.entries ?? []
+  return (await getLikesLeaderboard(event)) ?? []
 })

server/utils/likes-leaderboard.ts

@@ -10,25 +10,11 @@ const UpstreamLikesLeaderboardEntrySchema = v.object({
 })
 
 const UpstreamLikesLeaderboardResponseSchema = v.object({
-  totalLikes: v.optional(v.number()),
-  totalUniqueLikers: v.optional(v.number()),
   leaderBoard: v.array(UpstreamLikesLeaderboardEntrySchema),
 })
 
-type UpstreamLikesLeaderboardResponse = v.InferOutput<typeof UpstreamLikesLeaderboardResponseSchema>
-
-export type ResolvedLikesLeaderboard = {
-  totalLikes: number | null
-  totalUniqueLikers: number | null
-  entries: LikesLeaderboardEntry[]
-}
-
 const LIKES_LEADERBOARD_FETCH_TIMEOUT_MS = 750
 
-type LikesLeaderboardOptions = {
-  timeoutMs?: number
-}
-
 export const LIKES_LEADERBOARD_MAX_ENTRIES = 10
 
 export function extractPackageNameFromSubjectRef(subjectRef: string): string | null {
@@ -42,82 +28,69 @@ export function extractPackageNameFromSubjectRef(subjectRef: string): string | n
   }
 }
 
-export function normalizeLikesLeaderboardPayload(
-  payload: unknown,
-): ResolvedLikesLeaderboard | null {
+export function normalizeLikesLeaderboardPayload(payload: unknown): LikesLeaderboardEntry[] | null {
   const parsedPayload = v.safeParse(UpstreamLikesLeaderboardResponseSchema, payload)
   if (!parsedPayload.success) {
     return null
   }
 
   // PRECONDITION: the response is already sorted by totalLikes in descending order
-  const entries = parsedPayload.output.leaderBoard
-    .map((entry): LikesLeaderboardEntry | null => {
-      const packageName = extractPackageNameFromSubjectRef(entry.subjectRef)
-      if (!packageName) return null
-
-      return {
-        rank: 0,
-        packageName,
-        subjectRef: entry.subjectRef,
-        totalLikes: entry.totalLikes,
-      }
-    })
-    .filter((entry): entry is LikesLeaderboardEntry => entry !== null)
-    // oxlint-disable-next-line no-map-spread -- only a few elements
-    .map((entry, index) => ({
-      ...entry,
-      rank: index + 1,
-    }))
-
-  return {
-    totalLikes: parsedPayload.output.totalLikes ?? null,
-    totalUniqueLikers: parsedPayload.output.totalUniqueLikers ?? null,
-    entries,
-  }
+  return (
+    parsedPayload.output.leaderBoard
+      .map((entry): LikesLeaderboardEntry | null => {
+        const packageName = extractPackageNameFromSubjectRef(entry.subjectRef)
+        if (!packageName) return null
+
+        return {
+          rank: 0,
+          packageName,
+          subjectRef: entry.subjectRef,
+          totalLikes: entry.totalLikes,
+        }
+      })
+      .filter((entry): entry is LikesLeaderboardEntry => entry !== null)
+      // oxlint-disable-next-line no-map-spread -- only a few elements
+      .map((entry, index) => ({
+        ...entry,
+        rank: index + 1,
+      }))
+  )
 }
 
-export async function getLikesLeaderboard(
-  event: H3Event,
-  options: LikesLeaderboardOptions = {},
-): Promise<ResolvedLikesLeaderboard | null> {
-  const timeoutMs = options.timeoutMs ?? LIKES_LEADERBOARD_FETCH_TIMEOUT_MS
+export async function getLikesLeaderboard(event: H3Event): Promise<LikesLeaderboardEntry[] | null> {
   const cachedFetch = event.context.cachedFetch as CachedFetchFunction | undefined
   if (!cachedFetch) {
-    console.error('Something went wrong: event.context.cachedFetch is missing. Aborting fetch.', {
-      eventContext: event.context,
-    })
+    console.error('[likes-leaderboard] Missing cachedFetch in request context')
     return null
   }
 
   try {
     const url = new URL(LIKES_LEADERBOARD_API_URL)
     url.searchParams.set('limit', LIKES_LEADERBOARD_MAX_ENTRIES.toString())
 
-    const { data } = await cachedFetch<UpstreamLikesLeaderboardResponse>(
+    const { data } = await cachedFetch(
       url.toString(),
       {
         headers: {
           'User-Agent': 'npmx',
           'Accept': 'application/json',
         },
-        signal: AbortSignal.timeout(timeoutMs),
+        signal: AbortSignal.timeout(LIKES_LEADERBOARD_FETCH_TIMEOUT_MS),
       },
       CACHE_MAX_AGE_ONE_HOUR,
     )
 
     return normalizeLikesLeaderboardPayload(data)
   } catch (err) {
-    console.error('Failed to fetch likes leaderboard', { err })
+    console.error(
+      '[likes-leaderboard] Failed to fetch likes leaderboard:',
+      err instanceof Error ? err.message : 'Unknown error',
+    )
     return null
   }
 }
 
-export async function getTopLikedRank(
-  event: H3Event,
-  subjectRef: string,
-  options: LikesLeaderboardOptions = {},
-): Promise<number | null> {
-  const leaderboard = await getLikesLeaderboard(event, options)
-  return leaderboard?.entries.find(entry => entry.subjectRef === subjectRef)?.rank ?? null
+export async function getTopLikedRank(event: H3Event, subjectRef: string): Promise<number | null> {
+  const leaderboard = await getLikesLeaderboard(event)
+  return leaderboard?.find(entry => entry.subjectRef === subjectRef)?.rank ?? null
 }

test/unit/server/utils/likes-leaderboard.spec.ts

@@ -32,32 +32,26 @@ describe('extractPackageNameFromSubjectRef', () => {
 describe('normalizeLikesLeaderboardPayload', () => {
   it('normalizes upstream leaderboard payload into ranked entries', () => {
     const result = normalizeLikesLeaderboardPayload({
-      totalLikes: 320,
-      totalUniqueLikers: 75,
       leaderBoard: [
         { subjectRef: 'https://npmx.dev/package/vue', totalLikes: 120 },
         { subjectRef: 'https://npmx.dev/package/@nuxt/kit', totalLikes: 90 },
       ],
     })
 
-    expect(result).toEqual({
-      totalLikes: 320,
-      totalUniqueLikers: 75,
-      entries: [
-        {
-          rank: 1,
-          packageName: 'vue',
-          subjectRef: 'https://npmx.dev/package/vue',
-          totalLikes: 120,
-        },
-        {
-          rank: 2,
-          packageName: '@nuxt/kit',
-          subjectRef: 'https://npmx.dev/package/@nuxt/kit',
-          totalLikes: 90,
-        },
-      ],
-    })
+    expect(result).toEqual([
+      {
+        rank: 1,
+        packageName: 'vue',
+        subjectRef: 'https://npmx.dev/package/vue',
+        totalLikes: 120,
+      },
+      {
+        rank: 2,
+        packageName: '@nuxt/kit',
+        subjectRef: 'https://npmx.dev/package/@nuxt/kit',
+        totalLikes: 90,
+      },
+    ])
   })
 
   it('returns null for invalid upstream payloads', () => {
@@ -78,8 +72,6 @@ describe('getLikesLeaderboard', () => {
   it('fetches from the external leaderboard API with limit=10', async () => {
     const cachedFetch = vi.fn().mockResolvedValue({
       data: {
-        totalLikes: 320,
-        totalUniqueLikers: 75,
         leaderBoard: [{ subjectRef: 'https://npmx.dev/package/vue', totalLikes: 120 }],
       },
       isStale: false,
@@ -106,8 +98,6 @@ describe('getTopLikedRank', () => {
   it('returns the matching top liked rank for a subject ref', async () => {
     const cachedFetch = vi.fn().mockResolvedValue({
       data: {
-        totalLikes: 320,
-        totalUniqueLikers: 75,
         leaderBoard: [
           { subjectRef: 'https://npmx.dev/package/vue', totalLikes: 120 },
           { subjectRef: 'https://npmx.dev/package/nuxt', totalLikes: 90 },