@ampernic/vitepress-theme-alt-docs 0.1.23 → 0.1.24

package/dist/components/ADGlobalSearch.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { onKeyStroke, useScrollLock } from '@vueuse/core'
 import { useRouter } from 'vitepress'
-import { nextTick, onMounted, onUnmounted, ref, shallowRef, watch } from 'vue'
+import { computed, nextTick, onMounted, onUnmounted, ref, shallowRef, watch } from 'vue'
 
 // ── Dropdown ──────────────────────────────────────────────────────────────────
 
@@ -175,17 +175,65 @@ interface ResultData {
   excerpt: string
 }
 
+interface ResultStub { data: () => Promise<ResultData> }
+
+const PAGE_SIZE = 10
+
 const query = ref('')
 const selectedIndex = ref(0)
 const results = ref<ResultData[]>([])
 const searching = ref(false)
 
+// All relevance-ranked hits (lazy stubs); the visible page is loaded on
+// demand so results are never truncated.
+const stubs = shallowRef<ResultStub[]>([])
+const total = ref(0)
+const page = ref(1)
+const pageCount = computed(() => Math.max(1, Math.ceil(total.value / PAGE_SIZE)))
+const pageItems = computed<(number | '…')[]>(() => {
+  const n = pageCount.value
+  const c = page.value
+  if (n <= 7) return Array.from({ length: n }, (_, i) => i + 1)
+  const items: (number | '…')[] = [1]
+  const lo = Math.max(2, c - 1)
+  const hi = Math.min(n - 1, c + 1)
+  if (lo > 2) items.push('…')
+  for (let i = lo; i <= hi; i++) items.push(i)
+  if (hi < n - 1) items.push('…')
+  items.push(n)
+  return items
+})
+
 let searchTimer: ReturnType<typeof setTimeout> | null = null
+let loadToken = 0
+
+async function loadPage() {
+  const token = ++loadToken
+  const start = (page.value - 1) * PAGE_SIZE
+  const data = await Promise.all(
+    stubs.value.slice(start, start + PAGE_SIZE).map((r) => r.data()),
+  )
+  if (token !== loadToken) return
+  results.value = data
+  selectedIndex.value = 0
+}
+
+function goPage(p: number) {
+  const next = Math.min(Math.max(1, p), pageCount.value)
+  if (next !== page.value) page.value = next
+}
+function nextPage() { goPage(page.value + 1) }
+function prevPage() { goPage(page.value - 1) }
+
+watch(page, () => { if (stubs.value.length) loadPage() })
 
 watch([query, selectedDistro, selectedVersion], () => {
   selectedIndex.value = 0
+  page.value = 1
   if (searchTimer) clearTimeout(searchTimer)
   if (!query.value.trim() || !pagefind.value) {
+    stubs.value = []
+    total.value = 0
     results.value = []
     searching.value = false
     return
@@ -196,9 +244,11 @@ watch([query, selectedDistro, selectedVersion], () => {
     if (selectedDistro.value) f.distro = selectedDistro.value
     if (selectedVersion.value) f.version = selectedVersion.value
     const search = await pagefind.value.search(query.value, Object.keys(f).length ? { filters: f } : {})
-    results.value = await Promise.all(
-      search.results.slice(0, 12).map((r: { data: () => Promise<ResultData> }) => r.data()),
-    )
+    // Keep pagefind's relevance order; paginate instead of truncating.
+    stubs.value = search.results as ResultStub[]
+    total.value = search.results.length
+    page.value = 1
+    await loadPage()
     searching.value = false
   }, 200)
 })
@@ -324,28 +374,46 @@ function onOverlayClick(e: MouseEvent) { if (e.target === e.currentTarget) close
         </div>
 
         <!-- Results -->
-        <ul v-if="results.length" class="gs-results">
-          <li
-            v-for="(result, i) in results"
-            :key="result.url"
-            class="gs-result"
-            :class="{ 'is-selected': i === selectedIndex }"
-            @mouseenter="selectedIndex = i"
-            @click="go(result.url)"
-          >
-            <div class="gs-result-header">
-              <span class="gs-result-title">{{ result.meta.title }}</span>
-              <span v-if="parseUrl(result.url)" class="gs-result-badges">
-                <span class="gs-badge gs-badge--distro">
-                  {{ DISTRO_NAMES[parseUrl(result.url)!.distro] ?? parseUrl(result.url)!.distro }}
+        <template v-if="results.length">
+          <div class="gs-meta">
+            <span>{{ total }} результатов</span>
+            <span v-if="pageCount > 1">{{ page }} / {{ pageCount }}</span>
+          </div>
+          <ul class="gs-results">
+            <li
+              v-for="(result, i) in results"
+              :key="result.url"
+              class="gs-result"
+              :class="{ 'is-selected': i === selectedIndex }"
+              @mouseenter="selectedIndex = i"
+              @click="go(result.url)"
+            >
+              <div class="gs-result-header">
+                <span class="gs-result-title">{{ result.meta.title }}</span>
+                <span v-if="parseUrl(result.url)" class="gs-result-badges">
+                  <span class="gs-badge gs-badge--distro">
+                    {{ DISTRO_NAMES[parseUrl(result.url)!.distro] ?? parseUrl(result.url)!.distro }}
+                  </span>
+                  <span class="gs-badge gs-badge--version">{{ parseUrl(result.url)!.version }}</span>
                 </span>
-                <span class="gs-badge gs-badge--version">{{ parseUrl(result.url)!.version }}</span>
-              </span>
-            </div>
-            <!-- eslint-disable-next-line vue/no-v-html -->
-            <div class="gs-result-excerpt" v-html="result.excerpt" />
-          </li>
-        </ul>
+              </div>
+              <!-- eslint-disable-next-line vue/no-v-html -->
+              <div class="gs-result-excerpt" v-html="result.excerpt" />
+            </li>
+          </ul>
+          <nav v-if="pageCount > 1" class="gs-pagination" aria-label="Pagination">
+            <button class="gs-page-btn" :disabled="page === 1" aria-label="Назад" @click="prevPage">‹</button>
+            <button
+              v-for="(it, idx) in pageItems"
+              :key="idx"
+              class="gs-page-btn"
+              :class="{ 'is-active': it === page }"
+              :disabled="it === '…'"
+              @click="typeof it === 'number' && goPage(it)"
+            >{{ it }}</button>
+            <button class="gs-page-btn" :disabled="page === pageCount" aria-label="Вперёд" @click="nextPage">›</button>
+          </nav>
+        </template>
 
         <div v-else-if="indexLoading" class="gs-status">
           <span class="gs-spinner" />
@@ -541,6 +609,17 @@ function onOverlayClick(e: MouseEvent) { if (e.target === e.currentTarget) close
   font-weight: 500;
 }
 
+.gs-meta {
+  display: flex;
+  justify-content: space-between;
+  gap: 12px;
+  padding: 8px 16px;
+  border-bottom: 1px solid var(--vp-c-divider);
+  font-size: 12px;
+  color: var(--vp-c-text-3);
+  flex-shrink: 0;
+}
+
 .gs-results {
   overflow-y: auto;
   list-style: none;
@@ -549,6 +628,47 @@ function onOverlayClick(e: MouseEvent) { if (e.target === e.currentTarget) close
   flex: 1;
 }
 
+.gs-pagination {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 4px;
+  justify-content: center;
+  padding: 8px 16px;
+  border-top: 1px solid var(--vp-c-divider);
+  flex-shrink: 0;
+}
+
+.gs-page-btn {
+  min-width: 28px;
+  height: 28px;
+  padding: 0 6px;
+  border: 1px solid var(--vp-c-divider);
+  border-radius: 6px;
+  background: transparent;
+  color: var(--vp-c-text-2);
+  font-size: 13px;
+  cursor: pointer;
+  transition: background 0.1s, border-color 0.1s, color 0.1s;
+}
+
+.gs-page-btn:hover:not(:disabled):not(.is-active) {
+  border-color: var(--vp-c-brand-1);
+  color: var(--vp-c-brand-1);
+}
+
+.gs-page-btn.is-active {
+  background: var(--vp-c-brand-1);
+  border-color: var(--vp-c-brand-1);
+  color: var(--vp-c-bg);
+  font-weight: 600;
+  cursor: default;
+}
+
+.gs-page-btn:disabled {
+  opacity: 0.45;
+  cursor: default;
+}
+
 .gs-result {
   padding: 8px 12px;
   border-radius: 8px;

package/dist/components/ADProducts.vue

@@ -77,9 +77,15 @@ const hasLangPrefix = computed(
  * mode where the distro name is encoded in the VitePress `base` and absent
  * from route.path.
  */
+// A version segment is `\d+.\d+...` OR a platform dir `pN` (p10/p11).
+// Without the pN case, pN distros (alt-admin, Nets-Laboratories) were
+// treated as multi-distro mode and currentProduct became "p11", so the
+// products dropdown showed "P11" instead of the distribution name.
+const isVersionSeg = (s: string) => /^(\d+\.\d+(\.\d+)*|p\d+)$/.test(s)
+
 const isPerDistroMode = computed(() => {
   const parts = pathParts.value
-  return parts.length === 0 || /^\d+\.\d+/.test(parts[0])
+  return parts.length === 0 || isVersionSeg(parts[0])
 })
 
 const currentProduct = computed<string | null>(() => {

package/dist/components/ADProductsSidebar.vue

@@ -20,7 +20,13 @@ import { computed, ref, onMounted } from 'vue'
 import { useRoute, useData } from 'vitepress'
 
 interface DistroInfo { versions: string[]; latest: string; title?: string }
-interface SectionInfo { name: string; distros: string[] }
+// Sections come in two shapes: a group `{name, distros:[...]}` or a flat
+// top-level item `{name, distro:<slug>}`. Handling only `distros` made
+// `section.distros.filter` throw on flat entries, crashing the whole
+// products sidebar (blank sidebar on every distro landing).
+interface SectionInfo { name: string; distros?: string[]; distro?: string }
+const sectionDistros = (s: SectionInfo): string[] =>
+  s.distros ?? (s.distro ? [s.distro] : [])
 declare const __VERSIONS_DATA__: {
   distros: { [distroName: string]: DistroInfo }
   sections?: SectionInfo[]
@@ -59,6 +65,12 @@ const PRODUCT_NAMES: Record<string, string> = {
   'simply-linux': 'Симпли Линукс',
   'simply-linux-e2k': 'Симпли Линукс для Эльбрус',
   'group-policy': 'Групповые политики',
+  'alt-domain-p10': 'Альт Домен (p10)',
+  'alt-admin': 'Администрирование Альт',
+  'alt-platform-practic': 'Альт Платформа Практик',
+  'freeipa-p10': 'FreeIPA (p10)',
+  'freeipa-p11': 'FreeIPA (p11)',
+  'Nets-Laboratories': 'Лабораторные работы',
 }
 
 const productName = (d: string) =>
@@ -75,10 +87,14 @@ const contentPath = computed(() => {
   return base.length > 1 && p.startsWith(base) ? p.slice(base.length - 1) : p
 })
 
-// Show only on the landing page (no version segment like /11.0/…)
+// Show ONLY on the distro landing (path is exactly the distro root, no
+// segment). The old heuristic `!/^\d+\.\d+/.test(parts[0])` mis-fired for
+// pN version dirs (p10/p11): every p11 content page looked like a landing,
+// so the products sidebar rendered on top of the doc sidebar (two
+// sidebars on alt-admin etc.). The landing is unambiguously parts.length===0.
 const isLandingPage = computed(() => {
   const parts = contentPath.value.split('/').filter(Boolean)
-  return parts.length === 0 || !/^\d+\.\d+/.test(parts[0])
+  return parts.length === 0
 })
 
 // Current distro is encoded in the base in per-distro mode
@@ -92,7 +108,7 @@ interface SidebarGroup { title: string; distros: string[] }
 const groups = computed((): SidebarGroup[] => {
   const allDistros = Object.keys(versionsData.distros)
   const sections = versionsData.sections ?? []
-  const sectionedSet = new Set(sections.flatMap((s: SectionInfo) => s.distros))
+  const sectionedSet = new Set(sections.flatMap(sectionDistros))
 
   const unsectioned = allDistros.filter(d => !sectionedSet.has(d))
   const regular = unsectioned.filter(d => !d.endsWith('-e2k'))
@@ -105,7 +121,7 @@ const groups = computed((): SidebarGroup[] => {
   }
 
   for (const section of sections) {
-    const distros = section.distros.filter((d: string) => allDistros.includes(d))
+    const distros = sectionDistros(section).filter((d: string) => allDistros.includes(d))
     if (distros.length > 0) {
       result.push({ title: section.name, distros })
     }

package/dist/components/ADSearch.vue

@@ -22,6 +22,8 @@ const placeholder = computed(() =>
   <PagefindSearch
     :filters="filters"
     :placeholder="placeholder"
+    :page-size="10"
+    results-label="результатов"
     @close="emit('close')"
   />
 </template>

package/dist/index.mjs

@@ -19,16 +19,40 @@ import ADInlineImage from "./components/ADInlineImage.vue";
 import ADAssetLink from "./components/ADAssetLink.vue";
 import ADNavBarSearch from "./components/ADNavBarSearch.vue";
 import ExportButton from "@ampernic/vitepress-plugin-export/components/ExportButton.vue";
+import Breadcrumbs from "@ampernic/vitepress-plugin-breadcrumbs/components/Breadcrumbs.vue";
+import { productName } from "./productNames.mjs";
 import "./styles/theme.css";
 import "./styles/custom.css";
 import "./styles/icons.css";
 import "./styles/print.css";
+function breadcrumbsHome(ctx) {
+  if (!ctx.distro) return false;
+  const name = productName(ctx.distro);
+  const text = ctx.version && /^\d/.test(ctx.version) ? `${name} ${ctx.version}` : name;
+  return { text, link: ctx.landing };
+}
+function breadcrumbsPrefix(ctx) {
+  const arr = [{ text: "\u0413\u043B\u0430\u0432\u043D\u0430\u044F", link: "/" }];
+  if (ctx.distro && ctx.version && /^\d/.test(ctx.version)) {
+    arr.push({ text: productName(ctx.distro), link: `/${ctx.distro}/` });
+  }
+  return arr;
+}
 export const Theme = {
   Layout: () => h(DefaultTheme.Layout, null, {
     "nav-bar-content-before": () => h(ADNavBarSearch),
     "nav-bar-content-after": () => h(NolebaseEnhancedReadabilitiesMenu),
     "nav-screen-content-after": () => h(NolebaseEnhancedReadabilitiesScreenMenu),
     "sidebar-nav-before": () => h(ADProductsSidebar),
+    // Dynamic breadcrumbs above the page content (standalone package).
+    // `home` resolver adds a root crumb linking back to the document
+    // landing so the full path up to the index is always reachable.
+    "doc-before": () => h(Breadcrumbs, {
+      home: breadcrumbsHome,
+      prefix: breadcrumbsPrefix,
+      showOnHome: true,
+      hideSingle: false
+    }),
     // Above the outline ("Оглавление"), per request.
     "aside-outline-before": () => h(ExportButton)
   }),

package/dist/productNames.d.ts

@@ -0,0 +1,2 @@
+export declare const PRODUCT_NAMES: Record<string, string>;
+export declare function productName(slug: string): string;

package/dist/productNames.mjs

@@ -0,0 +1,29 @@
+export const PRODUCT_NAMES = {
+  "alt-domain": "\u0410\u043B\u044C\u0442 \u0414\u043E\u043C\u0435\u043D",
+  "alt-education": "\u0410\u043B\u044C\u0442 \u041E\u0431\u0440\u0430\u0437\u043E\u0432\u0430\u043D\u0438\u0435",
+  "alt-education-e2k": "\u0410\u043B\u044C\u0442 \u041E\u0431\u0440\u0430\u0437\u043E\u0432\u0430\u043D\u0438\u0435 \u0434\u043B\u044F \u042D\u043B\u044C\u0431\u0440\u0443\u0441",
+  "alt-server": "\u0410\u043B\u044C\u0442 \u0421\u0435\u0440\u0432\u0435\u0440",
+  "alt-server-e2k": "\u0410\u043B\u044C\u0442 \u0421\u0435\u0440\u0432\u0435\u0440 \u0434\u043B\u044F \u042D\u043B\u044C\u0431\u0440\u0443\u0441",
+  "alt-server-v": "\u0410\u043B\u044C\u0442 \u0421\u0435\u0440\u0432\u0435\u0440 \u0412\u0438\u0440\u0442\u0443\u0430\u043B\u0438\u0437\u0430\u0446\u0438\u0438",
+  "alt-workstation": "\u0410\u043B\u044C\u0442 \u0420\u0430\u0431\u043E\u0447\u0430\u044F \u0441\u0442\u0430\u043D\u0446\u0438\u044F",
+  "alt-workstation-e2k": "\u0410\u043B\u044C\u0442 \u0420\u0430\u0431\u043E\u0447\u0430\u044F \u0441\u0442\u0430\u043D\u0446\u0438\u044F \u0434\u043B\u044F \u042D\u043B\u044C\u0431\u0440\u0443\u0441",
+  "alt-kworkstation": "\u0410\u043B\u044C\u0442 \u0420\u0430\u0431\u043E\u0447\u0430\u044F \u0441\u0442\u0430\u043D\u0446\u0438\u044F K",
+  "alt-platform": "\u0410\u043B\u044C\u0442 \u041F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u0430",
+  "alt-mobile": "\u0410\u043B\u044C\u0442 \u041C\u043E\u0431\u0438\u043B\u044C\u043D\u044B\u0439",
+  "alt-virtualisation-one": "\u0410\u043B\u044C\u0442 \u0412\u0438\u0440\u0442\u0443\u0430\u043B\u0438\u0437\u0430\u0446\u0438\u044F ONE",
+  "alt-virtualization-pve": "\u0410\u043B\u044C\u0442 \u0412\u0438\u0440\u0442\u0443\u0430\u043B\u0438\u0437\u0430\u0446\u0438\u044F PVE",
+  "simply-linux": "\u0421\u0438\u043C\u043F\u043B\u0438 \u041B\u0438\u043D\u0443\u043A\u0441",
+  "simply-linux-e2k": "\u0421\u0438\u043C\u043F\u043B\u0438 \u041B\u0438\u043D\u0443\u043A\u0441 \u0434\u043B\u044F \u042D\u043B\u044C\u0431\u0440\u0443\u0441",
+  "group-policy": "\u0413\u0440\u0443\u043F\u043F\u043E\u0432\u044B\u0435 \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0438",
+  "alt-domain-p10": "\u0410\u043B\u044C\u0442 \u0414\u043E\u043C\u0435\u043D (p10)",
+  "alt-admin": "\u0410\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u0410\u043B\u044C\u0442",
+  "alt-platform-practic": "\u0410\u043B\u044C\u0442 \u041F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u0430 \u041F\u0440\u0430\u043A\u0442\u0438\u043A",
+  "freeipa-p10": "FreeIPA (p10)",
+  "freeipa-p11": "FreeIPA (p11)",
+  "Nets-Laboratories": "\u041B\u0430\u0431\u043E\u0440\u0430\u0442\u043E\u0440\u043D\u044B\u0435 \u0440\u0430\u0431\u043E\u0442\u044B"
+};
+export function productName(slug) {
+  return PRODUCT_NAMES[slug] ?? slug.split("-").map(
+    (w) => w === "alt" ? "ALT" : w === "e2k" ? "E2K" : w.charAt(0).toUpperCase() + w.slice(1)
+  ).join(" ");
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampernic/vitepress-theme-alt-docs",
-  "version": "0.1.23",
+  "version": "0.1.24",
   "description": "Shared VitePress theme for ALT Linux documentation",
   "license": "GPL-3.0-or-later",
   "author": "Ampernic",
@@ -27,17 +27,18 @@
   "peerDependencies": {
     "vitepress": "^1.0.0",
     "vue": "^3.0.0",
-    "@ampernic/vitepress-plugin-export": "^0.1.38"
+    "@ampernic/vitepress-plugin-export": "^0.1.39"
   },
   "dependencies": {
     "@alt-gnome/markdown-it-custom-containers": "^1.0.0",
     "@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.9",
+    "@ampernic/vitepress-plugin-alt-docs-versioning": "0.1.10",
+    "@ampernic/vitepress-plugin-breadcrumbs": "0.1.0",
     "@ampernic/vitepress-plugin-cross-site-router": "0.1.2",
-    "@ampernic/vitepress-plugin-pagefind": "0.1.8",
-    "@ampernic/vitepress-plugin-html-image": "0.1.2"
+    "@ampernic/vitepress-plugin-html-image": "0.1.2",
+    "@ampernic/vitepress-plugin-pagefind": "0.1.9"
   },
   "devDependencies": {
     "builtin-modules": "^3.3.0",