Merge branch 'main' into fix/dependencies-complex-versions

Author: alex-key

app/components/Package/Card.vue

@@ -172,7 +172,6 @@ const numberFormatter = useNumberFormatter()
           size="small"
           :aria-pressed="props.filters?.keywords.includes(keyword)"
           :title="`Filter by ${keyword}`"
-          :data-result-index="index"
           @click.stop="emit('clickKeyword', keyword)"
         >
           {{ keyword }}

app/pages/search.vue

@@ -453,6 +453,16 @@ watch(displayResults, results => {
   }
 })
 
+/**
+ * Focus the header search input
+ */
+function focusSearchInput() {
+  const searchInput = document.querySelector<HTMLInputElement>(
+    'input[type="search"], input[name="q"]',
+  )
+  searchInput?.focus()
+}
+
 function handleResultsKeydown(e: KeyboardEvent) {
   // If the active element is an input, navigate to exact match or wait for results
   if (e.key === 'Enter' && document.activeElement?.tagName === 'INPUT') {
@@ -489,7 +499,12 @@ function handleResultsKeydown(e: KeyboardEvent) {
 
   if (e.key === 'ArrowUp') {
     e.preventDefault()
-    const nextIndex = currentIndex < 0 ? 0 : Math.max(currentIndex - 1, 0)
+    // At first result or no result focused: return focus to search input
+    if (currentIndex <= 0) {
+      focusSearchInput()
+      return
+    }
+    const nextIndex = currentIndex - 1
     const el = elements[nextIndex]
     if (el) focusElement(el)
     return

server/utils/code-highlight.ts

@@ -167,7 +167,7 @@ interface LinkifyOptions {
  * @param html - The HTML to process
  * @param options - Dependencies map and optional relative import resolver
  */
-function linkifyImports(html: string, options?: LinkifyOptions): string {
+export function linkifyModuleSpecifiers(html: string, options?: LinkifyOptions): string {
   const { dependencies, resolveRelative } = options ?? {}
 
   const getHref = (moduleSpecifier: string): string | null => {
@@ -196,7 +196,7 @@ function linkifyImports(html: string, options?: LinkifyOptions): string {
   // Match: from keyword span followed by string span containing module specifier
   // Pattern: <span style="...">from</span><span style="..."> 'module'</span>
   let result = html.replace(
-    /(<span[^>]*>from<\/span>)(<span[^>]*>) (['"][^'"]+['"])<\/span>/g,
+    /(<span[^>]*> ?from<\/span>)(<span[^>]*>) (['"][^'"]+['"])<\/span>/g,
     (match, fromSpan, stringSpanOpen, moduleSpecifier) => {
       const href = getHref(moduleSpecifier)
       if (!href) return match
@@ -285,7 +285,7 @@ export async function highlightCode(
 
       // Make import statements clickable for JS/TS languages
       if (IMPORT_LANGUAGES.has(language)) {
-        html = linkifyImports(html, {
+        html = linkifyModuleSpecifiers(html, {
           dependencies: options?.dependencies,
           resolveRelative: options?.resolveRelative,
         })

test/e2e/interactions.spec.ts

@@ -73,6 +73,49 @@ test.describe('Search Pages', () => {
     await expect(page).toHaveURL(/\/(package|org|user)\/vue/)
   })
 
+  test('/search?q=vue → ArrowDown navigates only between results, not keyword buttons', async ({
+    page,
+    goto,
+  }) => {
+    await goto('/search?q=vue', { waitUntil: 'hydration' })
+
+    await expect(page.locator('text=/found \\d+|showing \\d+/i').first()).toBeVisible({
+      timeout: 15000,
+    })
+
+    const firstResult = page.locator('[data-result-index="0"]').first()
+    const secondResult = page.locator('[data-result-index="1"]').first()
+    await expect(firstResult).toBeVisible()
+    await expect(secondResult).toBeVisible()
+
+    // ArrowDown from input focuses the first result
+    await page.keyboard.press('ArrowDown')
+    await expect(firstResult).toBeFocused()
+
+    // Second ArrowDown focuses the second result (not a keyword button within the first)
+    await page.keyboard.press('ArrowDown')
+    await expect(secondResult).toBeFocused()
+  })
+
+  test('/search?q=vue → ArrowUp from first result returns focus to search input', async ({
+    page,
+    goto,
+  }) => {
+    await goto('/search?q=vue', { waitUntil: 'hydration' })
+
+    await expect(page.locator('text=/found \\d+|showing \\d+/i').first()).toBeVisible({
+      timeout: 15000,
+    })
+
+    // Navigate to first result
+    await page.keyboard.press('ArrowDown')
+    await expect(page.locator('[data-result-index="0"]').first()).toBeFocused()
+
+    // ArrowUp returns to the search input
+    await page.keyboard.press('ArrowUp')
+    await expect(page.locator('input[type="search"]')).toBeFocused()
+  })
+
   test('/search?q=vue → "/" focuses the search input from results', async ({ page, goto }) => {
     await goto('/search?q=vue', { waitUntil: 'hydration' })
 

test/unit/server/utils/code-highlight.spec.ts

@@ -0,0 +1,41 @@
+import { describe, expect, it } from 'vitest'
+import { linkifyModuleSpecifiers } from '../../../../server/utils/code-highlight'
+
+describe('linkifyModuleSpecifiers', () => {
+  const dependencies = {
+    'vue': { version: '3.4.0' },
+    '@unocss/webpack': { version: '0.65.3' },
+  }
+
+  it('should linkify import ... from "package"', () => {
+    // Shiki output for: import { ref } from "vue"
+    const html =
+      '<span class="line">' +
+      '<span style="color:#F97583">import</span>' +
+      '<span style="color:#E1E4E8"> { ref }</span>' +
+      '<span style="color:#F97583">from</span>' +
+      '<span style="color:#9ECBFF"> "vue"</span>' +
+      '</span>'
+
+    const result = linkifyModuleSpecifiers(html, { dependencies })
+    expect(result).toContain('<a href="/package-code/vue/v/3.4.0" class="import-link">')
+  })
+
+  it('should linkify export * from "package"', () => {
+    // Shiki output for: export * from "@unocss/webpack"
+    // Note: Shiki puts a leading space before "from" in the same span
+    const html =
+      '<span class="line">' +
+      '<span style="color:#F97583">export</span>' +
+      '<span style="color:#E1E4E8"> *</span>' +
+      '<span style="color:#F97583"> from</span>' +
+      '<span style="color:#9ECBFF"> "@unocss/webpack"</span>' +
+      '<span style="color:#E1E4E8">;</span>' +
+      '</span>'
+
+    const result = linkifyModuleSpecifiers(html, { dependencies })
+    expect(result).toContain(
+      '<a href="/package-code/@unocss/webpack/v/0.65.3" class="import-link">',
+    )
+  })
+})