@ampernic/vitepress-theme-alt-docs 0.1.6 → 0.1.11

package/README.md

@@ -21,16 +21,37 @@ export default Theme
 ### Config helpers
 
 ```ts
-// .vitepress/config.ts
-import { defineConfig } from 'vitepress'
-import { sharedConfig } from '@ampernic/vitepress-theme-alt-docs/config'
+// .vitepress/config/index.mts
+import { defineConfigWithTheme } from 'vitepress'
+import { createSharedConfig } from '@ampernic/vitepress-theme-alt-docs/config'
+import { ru } from './ru'
 
-export default defineConfig({
-  ...sharedConfig,
-  // ... специфичный для сайта конфиг
+const shared = createSharedConfig({
+  distroName: 'alt-domain',
+  allDistros: ['alt-domain', 'alt-workstation', 'alt-virtualization-pve', 'group-policy'],
+  // Группировка дистрибутивов в подменю (необязательно):
+  sections: [
+    { name: 'Альт Виртуализация', distros: ['alt-virtualization-pve'] },
+    { name: 'Групповые политики', distros: ['group-policy'] },
+  ],
+})
+
+export default defineConfigWithTheme({
+  ...shared,
+  locales: { root: { label: 'Русский', ...ru } },
 })
 ```
 
+#### Опции `createSharedConfig`
+
+| Опция | Тип | Описание |
+|-------|-----|----------|
+| `distroName` | `string` | Slug текущего дистрибутива |
+| `allDistros` | `string[]` | Полный список дистрибутивов для переключателя |
+| `sections` | `SectionInfo[]` | Именованные группы дистрибутивов в переключателе продуктов |
+| `hostname` | `string` | Hostname для sitemap |
+| `editLinkRepo` | `string` | URL репозитория для «Предложить правки» |
+
 ## Компоненты
 
 | Компонент | Описание |
@@ -39,11 +60,24 @@ export default defineConfig({
 | `ADProducts` | Переключатель продуктов/дистрибутивов |
 | `ADProductsSidebar` | Боковая панель с выбором продукта |
 | `ADVersioning` | Переключатель версий документации |
-| `ADNavBarSearch` | Интеграция поиска в навбар |
-| `ADSearch` | Компонент поиска (Pagefind) |
+| `ADNavBarSearch` | Кнопка открытия глобального поиска в навбаре |
+| `ADGlobalSearch` | Глобальный поиск по всем дистрибутивам через Pagefind `mergeIndex` |
+| `ADSearch` | Компонент поиска для одного сайта (Pagefind) |
 | `ADAssetLink` | Ссылка на файл-ассет |
 | `ADInlineImage` | Встроенное изображение с нормализацией пути |
 
+### ADGlobalSearch
+
+Поисковая модалка для индексного сайта, объединяющая индексы всех задеплоенных дистрибутивов.
+
+**Как работает:**
+1. Последовательно пробует `import(/{distro}/pagefind/pagefind.js)` для каждого дистрибутива из списка
+2. HEAD-проверяет `pagefind-entry.json` для остальных дистрибутивов — только подтверждённые идут в `mergeIndex`
+   > Важно: вызов `mergeIndex()` для несуществующего пути необратимо ломает SharedWorker Pagefind, все последующие запросы тоже падают
+3. Загружает `pagefind/distro-meta.json` с каждого сайта — получает точный список версий по дистрибутиву
+   > `pagefind.filters()` при объединённых индексах возвращает значения со всех сайтов без изоляции, поэтому для dropdown версий используется manifest, а не API Pagefind
+4. Отображает фильтры по дистрибутиву и версии; при смене дистрибутива версии обновляются из manifest
+
 ## Включённые плагины
 
 Тема автоматически подключает:

package/dist/components/ADGlobalSearch.vue

@@ -1,7 +1,36 @@
 <script setup lang="ts">
 import { onKeyStroke, useScrollLock } from '@vueuse/core'
 import { useRouter } from 'vitepress'
-import { computed, nextTick, onMounted, onUnmounted, ref, shallowRef, watch } from 'vue'
+import { nextTick, onMounted, onUnmounted, ref, shallowRef, watch } from 'vue'
+
+// ── Dropdown ──────────────────────────────────────────────────────────────────
+
+interface DropdownRect { top: number; left: number; width: number }
+
+function useDropdown() {
+  const open = ref(false)
+  const rect = ref<DropdownRect | null>(null)
+  const triggerRef = ref<HTMLElement | null>(null)
+
+  function toggle() {
+    if (!open.value && triggerRef.value) {
+      const r = triggerRef.value.getBoundingClientRect()
+      rect.value = { top: r.bottom + 4, left: r.left, width: r.width }
+    }
+    open.value = !open.value
+  }
+  function close() { open.value = false }
+  function onOutside(e: MouseEvent) {
+    if (triggerRef.value && !triggerRef.value.contains(e.target as Node)) close()
+  }
+  onMounted(() => document.addEventListener('mousedown', onOutside))
+  onUnmounted(() => document.removeEventListener('mousedown', onOutside))
+
+  return { open, rect, triggerRef, toggle, close }
+}
+
+const distroDropdown = useDropdown()
+const versionDropdown = useDropdown()
 
 const emit = defineEmits<{ (e: 'close'): void }>()
 const router = useRouter()
@@ -40,18 +69,20 @@ const indexLoading = ref(true)
 const loadError = ref(false)
 const availableDistros = ref<string[]>([])
 const availableVersions = ref<string[]>([])
+// Per-distro version map from distro-meta.json — pagefind's merged-index filter API
+// leaks version values across distros, so we use this static manifest instead.
+const distroVersionMap = ref<Record<string, string[]>>({})
 
 async function loadIndexes() {
   // Always use absolute paths from origin root — current site base is irrelevant
-  // (on /alt-platform/ we still need to load /alt-domain/pagefind/pagefind.js)
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let pf: any = null
   let firstIdx = -1
 
+  // Find first available distro to get the pagefind module
   for (let i = 0; i < ALL_DISTROS.length; i++) {
     try {
-      // @vite-ignore
       pf = await import(/* @vite-ignore */ `/${ALL_DISTROS[i]}/pagefind/pagefind.js`)
       firstIdx = i
       break
@@ -60,23 +91,60 @@ async function loadIndexes() {
 
   if (!pf) throw new Error('no pagefind index found')
 
-  for (let i = firstIdx + 1; i < ALL_DISTROS.length; i++) {
-    try {
-      await pf.mergeIndex(`/${ALL_DISTROS[i]}/pagefind`)
-    } catch { /* skip */ }
+  // init() must be called before mergeIndex()
+  await pf.init()
+
+  // Pre-check which distros have a pagefind index before calling mergeIndex.
+  // A failed mergeIndex() permanently corrupts pagefind's SharedWorker state,
+  // making subsequent filters()/search() calls fail with "Failed to load Pagefind metadata".
+  const allDistros = [ALL_DISTROS[firstIdx], ...ALL_DISTROS.slice(firstIdx + 1)]
+  const metaResults = await Promise.all(
+    allDistros.map(async distro => {
+      try {
+        const r = await fetch(`/${distro}/pagefind/pagefind-entry.json`, { method: 'HEAD' })
+        if (!r.ok) return null
+        // Fetch distro-meta.json for accurate per-distro filter values.
+        // pagefind's merged-index filter API leaks values across distros.
+        const meta = await fetch(`/${distro}/pagefind/distro-meta.json`)
+          .then(r => r.ok ? r.json() : null)
+          .catch(() => null) as Record<string, string[]> | null
+        return { distro, meta }
+      } catch { return null }
+    }),
+  )
+
+  const confirmed = metaResults.filter((m): m is { distro: string; meta: Record<string, string[]> | null } => m !== null)
+  const available = confirmed.slice(1).map(m => m.distro)
+
+  // Build per-distro version map from distro-meta.json manifests
+  const versionMap: Record<string, string[]> = {}
+  const allVersionsSet = new Set<string>()
+  for (const { distro, meta } of confirmed) {
+    const versions = sortVersions(meta?.version ?? [])
+    versionMap[distro] = versions
+    for (const v of versions) allVersionsSet.add(v)
   }
+  distroVersionMap.value = versionMap
 
-  await pf.init()
+  // Merge only confirmed indexes in parallel
+  await Promise.allSettled(
+    available.map(distro => pf.mergeIndex(`/${distro}/pagefind`)),
+  )
 
   const filters = await pf.filters() as Record<string, Record<string, number>>
   availableDistros.value = Object.keys(filters.distro ?? {}).sort()
-  availableVersions.value = Object.keys(filters.version ?? {}).sort((a, b) => {
+  // Use versions from manifests (accurate) rather than pagefind filters (leaky across indexes)
+  availableVersions.value = sortVersions([...allVersionsSet])
+
+  return pf
+}
+
+function sortVersions(versions: string[]): string[] {
+  return versions.sort((a, b) => {
     const [aMaj, aMin] = a.split('.').map(Number)
     const [bMaj, bMin] = b.split('.').map(Number)
     return bMaj !== aMaj ? bMaj - aMaj : bMin - aMin
   })
-
-  return pf
 }
 
 // ── Filters ───────────────────────────────────────────────────────────────────
@@ -84,7 +152,20 @@ async function loadIndexes() {
 const selectedDistro = ref('')
 const selectedVersion = ref('')
 
-watch(selectedDistro, () => { selectedVersion.value = '' })
+// When distro changes: reset version and update available versions from the manifest
+watch(selectedDistro, () => {
+  selectedVersion.value = ''
+  if (!selectedDistro.value) {
+    // Show union of all versions across all distros
+    const all = new Set<string>()
+    for (const versions of Object.values(distroVersionMap.value)) {
+      for (const v of versions) all.add(v)
+    }
+    availableVersions.value = sortVersions([...all])
+  } else {
+    availableVersions.value = distroVersionMap.value[selectedDistro.value] ?? []
+  }
+})
 
 // ── Search ────────────────────────────────────────────────────────────────────
 
@@ -159,6 +240,13 @@ onMounted(async () => {
   inputEl.value?.focus()
   try {
     pagefind.value = await loadIndexes()
+    // Re-trigger search if user already typed while indexes were loading
+    if (query.value.trim()) {
+      const saved = query.value
+      query.value = ''
+      await nextTick()
+      query.value = saved
+    }
   } catch {
     loadError.value = true
   } finally {
@@ -198,16 +286,41 @@ function onOverlayClick(e: MouseEvent) { if (e.target === e.currentTarget) close
 
         <!-- Filters row (shown once indexes loaded and have data) -->
         <div v-if="!indexLoading && (availableDistros.length || availableVersions.length)" class="gs-filters">
-          <select v-model="selectedDistro" class="gs-select">
-            <option value="">Все дистрибутивы</option>
-            <option v-for="d in availableDistros" :key="d" :value="d">
-              {{ DISTRO_NAMES[d] ?? d }}
-            </option>
-          </select>
-          <select v-model="selectedVersion" class="gs-select">
-            <option value="">Все версии</option>
-            <option v-for="v in availableVersions" :key="v" :value="v">{{ v }}</option>
-          </select>
+
+          <!-- Distro dropdown -->
+          <div class="gs-dd" :class="{ 'is-open': distroDropdown.open.value }">
+            <button :ref="(el) => { distroDropdown.triggerRef.value = el as HTMLElement | null }" class="gs-dd-trigger" :class="{ 'is-active': selectedDistro }" @click="versionDropdown.close(); distroDropdown.toggle()">
+              <span>{{ selectedDistro ? (DISTRO_NAMES[selectedDistro] ?? selectedDistro) : 'Все дистрибутивы' }}</span>
+              <svg class="gs-dd-chevron" width="12" height="12" viewBox="0 0 24 24"><path fill="currentColor" d="M7 10l5 5 5-5z"/></svg>
+            </button>
+            <Teleport to="body">
+              <ul v-if="distroDropdown.open.value && distroDropdown.rect.value" class="gs-dd-list gs-dd-list--fixed"
+                :style="{ top: distroDropdown.rect.value.top + 'px', left: distroDropdown.rect.value.left + 'px', width: distroDropdown.rect.value.width + 'px' }">
+                <li class="gs-dd-item" :class="{ 'is-selected': selectedDistro === '' }"
+                  @click="selectedDistro = ''; distroDropdown.close()">Все дистрибутивы</li>
+                <li v-for="d in availableDistros" :key="d" class="gs-dd-item" :class="{ 'is-selected': selectedDistro === d }"
+                  @click="selectedDistro = d; distroDropdown.close()">{{ DISTRO_NAMES[d] ?? d }}</li>
+              </ul>
+            </Teleport>
+          </div>
+
+          <!-- Version dropdown -->
+          <div class="gs-dd" :class="{ 'is-open': versionDropdown.open.value }">
+            <button :ref="(el) => { versionDropdown.triggerRef.value = el as HTMLElement | null }" class="gs-dd-trigger" :class="{ 'is-active': selectedVersion }" @click="distroDropdown.close(); versionDropdown.toggle()">
+              <span>{{ selectedVersion || 'Все версии' }}</span>
+              <svg class="gs-dd-chevron" width="12" height="12" viewBox="0 0 24 24"><path fill="currentColor" d="M7 10l5 5 5-5z"/></svg>
+            </button>
+            <Teleport to="body">
+              <ul v-if="versionDropdown.open.value && versionDropdown.rect.value" class="gs-dd-list gs-dd-list--fixed"
+                :style="{ top: versionDropdown.rect.value.top + 'px', left: versionDropdown.rect.value.left + 'px', width: versionDropdown.rect.value.width + 'px' }">
+                <li class="gs-dd-item" :class="{ 'is-selected': selectedVersion === '' }"
+                  @click="selectedVersion = ''; versionDropdown.close()">Все версии</li>
+                <li v-for="v in availableVersions" :key="v" class="gs-dd-item" :class="{ 'is-selected': selectedVersion === v }"
+                  @click="selectedVersion = v; versionDropdown.close()">{{ v }}</li>
+              </ul>
+            </Teleport>
+          </div>
+
         </div>
 
         <!-- Results -->
@@ -325,26 +438,107 @@ function onOverlayClick(e: MouseEvent) { if (e.target === e.currentTarget) close
 .gs-filters {
   display: flex;
   gap: 8px;
-  padding: 8px 16px;
+  padding: 10px 16px;
   border-bottom: 1px solid var(--vp-c-divider);
-  background: var(--vp-c-default-soft);
 }
 
-.gs-select {
+/* ── Custom dropdown ── */
+.gs-dd {
+  position: relative;
   flex: 1;
   min-width: 0;
-  padding: 5px 8px;
+}
+
+.gs-dd-trigger {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 6px;
+  padding: 6px 10px;
   font-size: 13px;
-  background: var(--vp-c-bg);
+  font-family: inherit;
+  background: var(--vp-c-bg-soft);
   border: 1px solid var(--vp-c-divider);
-  border-radius: 6px;
-  color: var(--vp-c-text-1);
+  border-radius: 8px;
+  color: var(--vp-c-text-2);
   cursor: pointer;
   outline: none;
+  text-align: left;
+  transition: border-color 0.15s, color 0.15s;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+.gs-dd-trigger span {
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.gs-dd-trigger.is-active {
+  color: var(--vp-c-text-1);
+  border-color: var(--vp-c-brand-1);
+}
+
+.gs-dd-trigger:hover {
+  border-color: var(--vp-c-text-2);
+  color: var(--vp-c-text-1);
 }
 
-.gs-select:focus {
+.gs-dd.is-open .gs-dd-trigger {
   border-color: var(--vp-c-brand-1);
+  box-shadow: 0 0 0 2px var(--vp-c-brand-soft);
+  color: var(--vp-c-text-1);
+}
+
+.gs-dd-chevron {
+  flex-shrink: 0;
+  color: var(--vp-c-text-3);
+  transition: transform 0.15s;
+}
+
+.gs-dd.is-open .gs-dd-chevron {
+  transform: rotate(180deg);
+}
+
+.gs-dd-list {
+  list-style: none;
+  margin: 0;
+  padding: 4px;
+  background: var(--vp-c-bg-elv);
+  border: 1px solid var(--vp-c-divider);
+  border-radius: 8px;
+  box-shadow: var(--vp-shadow-3);
+  max-height: 220px;
+  overflow-y: auto;
+}
+
+.gs-dd-list--fixed {
+  position: fixed;
+  z-index: 200;
+}
+
+.gs-dd-item {
+  padding: 6px 10px;
+  font-size: 13px;
+  border-radius: 6px;
+  cursor: pointer;
+  color: var(--vp-c-text-2);
+  transition: background 0.1s, color 0.1s;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.gs-dd-item:hover {
+  background: var(--vp-c-default-soft);
+  color: var(--vp-c-text-1);
+}
+
+.gs-dd-item.is-selected {
+  background: var(--vp-c-brand-soft);
+  color: var(--vp-c-brand-1);
+  font-weight: 500;
 }
 
 .gs-results {
@@ -455,16 +649,17 @@ function onOverlayClick(e: MouseEvent) { if (e.target === e.currentTarget) close
   padding: 8px 16px;
   border-top: 1px solid var(--vp-c-divider);
   font-size: 12px;
-  color: var(--vp-c-text-3);
+  color: var(--vp-c-text-2);
 }
 
 kbd {
-  background: var(--vp-c-default-soft);
-  border: 1px solid var(--vp-c-divider);
+  background: var(--vp-c-bg-soft);
+  border: 1px solid var(--vp-c-text-3);
   border-radius: 4px;
   padding: 1px 5px;
   font-size: 11px;
   font-family: inherit;
+  color: var(--vp-c-text-1);
 }
 </style>
 

package/dist/components/ADProducts.vue

@@ -18,8 +18,14 @@ interface DistroInfo {
   title?: string
 }
 
+interface SectionInfo {
+  name: string
+  distros: string[]
+}
+
 declare const __VERSIONS_DATA__: {
   distros: { [distroName: string]: DistroInfo }
+  sections?: SectionInfo[]
 }
 
 const getSafeVersionsData = (): { distros: { [k: string]: DistroInfo } } => {
@@ -162,11 +168,22 @@ const makeProductItem = (product: string) => {
 }
 
 const menuGroupItem = computed((): DefaultTheme.NavItemWithChildren => {
-  const regular = availableProducts.value.filter((p) => !p.endsWith('-e2k'))
-  const e2k = availableProducts.value.filter((p) => p.endsWith('-e2k'))
+  const sections = versionsData.sections ?? []
+  const sectionedDistros = new Set(sections.flatMap((s) => s.distros))
+
+  const unsectioned = availableProducts.value.filter((p) => !sectionedDistros.has(p))
+  const regular = unsectioned.filter((p) => !p.endsWith('-e2k'))
+  const e2k = unsectioned.filter((p) => p.endsWith('-e2k'))
 
   const items: DefaultTheme.NavItemWithChildren['items'] = regular.map(makeProductItem)
 
+  for (const section of sections) {
+    const sectionDistros = section.distros.filter((d) => availableProducts.value.includes(d))
+    if (sectionDistros.length > 0) {
+      items.push({ text: section.name, items: sectionDistros.map(makeProductItem) })
+    }
+  }
+
   if (e2k.length > 0) {
     items.push({ text: 'Для Эльбрус', items: e2k.map(makeProductItem) })
   }

package/dist/config/shared.d.ts

@@ -1,4 +1,6 @@
 import { DefaultTheme } from 'vitepress';
+import type { SectionInfo } from '@ampernic/vitepress-plugin-alt-docs-versioning';
+export type { SectionInfo };
 export interface SharedConfigOptions {
     /** Distro slug for this VitePress instance, e.g. `'alt-domain'`. */
     distroName: string;
@@ -7,6 +9,17 @@ export interface SharedConfigOptions {
      * When omitted only the current distro appears in the menu — fine for local dev.
      */
     allDistros?: string[];
+    /**
+     * Optional nav groupings for the ADProducts switcher.
+     * Each entry renders as a sub-menu with a display name.
+     *
+     * @example
+     * sections: [
+     *   { name: 'Альт Виртуализация', distros: ['alt-virtualization-pve', 'alt-virtualisation-one'] },
+     *   { name: 'Групповые политики', distros: ['group-policy'] },
+     * ]
+     */
+    sections?: SectionInfo[];
     /** Sitemap hostname, e.g. `'https://docs.altlinux.org'`. */
     hostname?: string;
     /**

package/dist/config/shared.js

@@ -49,7 +49,8 @@ function createSharedConfig(options) {
       },
       plugins: [...pagefind.vite.plugins, (0, _vitepressPluginAltDocsVersioning.VersioningPlugin)({
         distroName: options.distroName,
-        allDistros: options.allDistros
+        allDistros: options.allDistros,
+        sections: options.sections
       })]
     },
     srcDir: "docs",
@@ -74,6 +75,7 @@ function createSharedConfig(options) {
         light: "/branding/basealt/logo-col.svg",
         alt: "ALT Linux Documentation"
       },
+      logoLink: "/",
       siteTitle: "ALT Linux Docs",
       outline: {
         level: [2, 3]

package/dist/config/shared.mjs

@@ -52,7 +52,8 @@ export function createSharedConfig(options) {
         ...pagefind.vite.plugins,
         VersioningPlugin({
           distroName: options.distroName,
-          allDistros: options.allDistros
+          allDistros: options.allDistros,
+          sections: options.sections
         })
       ]
     },
@@ -72,6 +73,7 @@ export function createSharedConfig(options) {
         light: "/branding/basealt/logo-col.svg",
         alt: "ALT Linux Documentation"
       },
+      logoLink: "/",
       siteTitle: "ALT Linux Docs",
       outline: { level: [2, 3] },
       socialLinks: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampernic/vitepress-theme-alt-docs",
-  "version": "0.1.6",
+  "version": "0.1.11",
   "description": "Shared VitePress theme for ALT Linux documentation",
   "license": "GPL-3.0-or-later",
   "author": "Ampernic",
@@ -33,10 +33,10 @@
     "@nolebase/vitepress-plugin-enhanced-readabilities": "^2.14.0",
     "markdown-it-kbd": "^1.0.0",
     "vitepress-plugin-tabs": "^0.6.0",
-    "@ampernic/vitepress-plugin-alt-docs-versioning": "0.1.2",
+    "@ampernic/vitepress-plugin-alt-docs-versioning": "0.1.3",
     "@ampernic/vitepress-plugin-html-image": "0.1.2",
-    "@ampernic/vitepress-plugin-cross-site-router": "0.1.2",
-    "@ampernic/vitepress-plugin-pagefind": "0.1.5"
+    "@ampernic/vitepress-plugin-pagefind": "0.1.8",
+    "@ampernic/vitepress-plugin-cross-site-router": "0.1.2"
   },
   "devDependencies": {
     "builtin-modules": "^3.3.0",