@lupinum/ginko-content 0.1.1 → 0.1.2

package/dist/runtime/app/composables/head.js

@@ -4,95 +4,99 @@ function isHeadImageObject(image) {
   return typeof image === "object" && image !== null;
 }
 export const useContentHead = (_content, to = useRoute()) => {
-  const content = unref(_content);
   const config = useRuntimeConfig();
-  const appConfig = config.app;
   const applyHead = (head) => useHead(head);
-  const refreshHead = (data = content) => {
-    if (!to.path || !data) {
-      return;
-    }
-    const head = Object.assign({}, data?.head || {});
-    head.meta = [...head.meta || []];
-    head.link = [...head.link || []];
-    const title = head.title || data?.title;
-    if (title) {
-      head.title = title;
-      if (import.meta.server && !head.meta.some((m) => m.property === "og:title")) {
-        head.meta.push({
-          property: "og:title",
-          content: title
-        });
-      }
+  const refreshHead = (data = unref(_content)) => {
+    const head = resolveContentHead(data, to, config);
+    if (!head) return;
+    if (import.meta.client) {
+      nextTick(() => applyHead(head));
+    } else {
+      applyHead(head);
     }
-    const siteUrl = typeof config.public.siteUrl === "string" ? withoutTrailingSlash(config.public.siteUrl) : void 0;
-    if (import.meta.server && siteUrl) {
-      const url = withoutTrailingSlash(joinURL(siteUrl, appConfig.baseURL, to.fullPath));
-      if (!head.meta.some((m) => m.property === "og:url")) {
-        head.meta.push({
-          property: "og:url",
-          content: url
-        });
-      }
-      if (!head.link.some((m) => m.rel === "canonical")) {
-        head.link.push({
-          rel: "canonical",
-          href: url
-        });
-      }
+  };
+  watch(() => unref(_content), refreshHead, { immediate: true });
+};
+export const resolveContentHead = (data, to, config) => {
+  if (!to.path || !data) {
+    return null;
+  }
+  const head = Object.assign({}, data?.head || data?.seo || {});
+  const appConfig = config.app;
+  head.meta = [...head.meta || []];
+  head.link = [...head.link || []];
+  const title = head.title || data?.title;
+  if (title) {
+    head.title = title;
+    if (import.meta.server && !head.meta.some((m) => m.property === "og:title")) {
+      head.meta.push({
+        property: "og:title",
+        content: title
+      });
     }
-    const description = head?.description || data?.description;
-    if (description && head.meta.filter((m) => m.name === "description").length === 0) {
+  }
+  const siteUrl = typeof config.public.siteUrl === "string" ? withoutTrailingSlash(config.public.siteUrl) : void 0;
+  if (import.meta.server && siteUrl) {
+    const url = withoutTrailingSlash(joinURL(siteUrl, appConfig.baseURL, to.fullPath));
+    if (!head.meta.some((m) => m.property === "og:url")) {
       head.meta.push({
-        name: "description",
-        content: description
+        property: "og:url",
+        content: url
+      });
+    }
+    if (!head.link.some((m) => m.rel === "canonical")) {
+      head.link.push({
+        rel: "canonical",
+        href: url
       });
     }
-    if (import.meta.server && description && !head.meta.some((m) => m.property === "og:description")) {
+  }
+  const description = head?.description || data?.description;
+  if (description && head.meta.filter((m) => m.name === "description").length === 0) {
+    head.meta.push({
+      name: "description",
+      content: description
+    });
+  }
+  if (import.meta.server && description && !head.meta.some((m) => m.property === "og:description")) {
+    head.meta.push({
+      property: "og:description",
+      content: description
+    });
+  }
+  const image = head?.image || data?.image;
+  if (import.meta.server && image && head.meta.filter((m) => m.property === "og:image").length === 0) {
+    if (typeof image === "string") {
       head.meta.push({
-        property: "og:description",
-        content: description
+        property: "og:image",
+        content: siteUrl && !hasProtocol(image) ? new URL(joinURL(appConfig.baseURL, image), siteUrl).href : image
       });
     }
-    const image = head?.image || data?.image;
-    if (import.meta.server && image && head.meta.filter((m) => m.property === "og:image").length === 0) {
-      if (typeof image === "string") {
-        head.meta.push({
-          property: "og:image",
-          content: siteUrl && !hasProtocol(image) ? new URL(joinURL(appConfig.baseURL, image), siteUrl).href : image
-        });
-      }
-      if (isHeadImageObject(image)) {
-        const imageKeys = [
-          "src",
-          "secure_url",
-          "type",
-          "width",
-          "height",
-          "alt"
-        ];
-        for (const key of imageKeys) {
-          if (key === "src" && image.src) {
-            const isAbsoluteURL = hasProtocol(image.src);
-            const imageURL = isAbsoluteURL ? image.src : joinURL(appConfig.baseURL, image.src ?? "/");
-            head.meta.push({
-              property: "og:image",
-              content: siteUrl && !isAbsoluteURL ? new URL(imageURL, siteUrl).href : imageURL
-            });
-          } else if (image[key]) {
-            head.meta.push({
-              property: `og:image:${key}`,
-              content: image[key]
-            });
-          }
+    if (isHeadImageObject(image)) {
+      const imageKeys = [
+        "src",
+        "secure_url",
+        "type",
+        "width",
+        "height",
+        "alt"
+      ];
+      for (const key of imageKeys) {
+        if (key === "src" && image.src) {
+          const isAbsoluteURL = hasProtocol(image.src);
+          const imageURL = isAbsoluteURL ? image.src : joinURL(appConfig.baseURL, image.src ?? "/");
+          head.meta.push({
+            property: "og:image",
+            content: siteUrl && !isAbsoluteURL ? new URL(imageURL, siteUrl).href : imageURL
+          });
+        } else if (image[key]) {
+          head.meta.push({
+            property: `og:image:${key}`,
+            content: image[key]
+          });
         }
       }
     }
-    if (import.meta.client) {
-      nextTick(() => applyHead(head));
-    } else {
-      applyHead(head);
-    }
-  };
-  watch(() => unref(_content), refreshHead, { immediate: true });
+  }
+  return head;
 };

package/dist/runtime/app/composables/query-api.d.ts

@@ -1,26 +1,25 @@
 import type { ParsedContent } from '../../../types/content';
-import type { ContentCollectionHandle } from '../../../types/config';
-import type { ContentVariant, ContentTreeItem, BacklinksOptions, BacklinksResult, BacklinkSource, DocumentFromHandle, ManyOptions, LocalizedDoc, NeighborsOptions, NeighborsResult, OneOptions, PopulateSpec, PopulateFromOptions, PopulatedDocument, PaginationOptions, PaginationResult, ResolveOneOptions, ResolveOneResult, TreeOptions, VariantsOptions } from '../../../types/query';
+import type { ContentCollectionTarget, ContentVariant, ContentTreeItem, BacklinksOptions, BacklinksResult, BacklinkSource, DocumentFromHandle, ManyOptions, LocalizedDoc, NeighborsOptions, NeighborsResult, OneOptions, PopulateSpec, PopulateFromOptions, PopulatedDocument, PaginationOptions, PaginationResult, ResolveOneOptions, ResolveOneResult, TreeOptions, VariantsOptions } from '../../../types/query';
 import { type ContentQueryContext } from '../../query/unified';
 export declare const createClientContentQueryContext: () => ContentQueryContext;
-export declare function resolveOne<const H extends ContentCollectionHandle | string, O extends ResolveOneOptions<H, PopulateSpec | undefined>>(handle: H, options: O): Promise<ResolveOneResult<PopulatedDocument<DocumentFromHandle<H>, PopulateFromOptions<O>>>>;
-export declare function one<const H extends ContentCollectionHandle | string, O extends OneOptions<H, PopulateSpec | undefined>>(handle: H, options: O): Promise<LocalizedDoc<PopulatedDocument<DocumentFromHandle<H>, PopulateFromOptions<O>>> | null>;
-export declare function many<const H extends ContentCollectionHandle | string, O extends ManyOptions<H, PopulateSpec | undefined>>(handle: H, options?: O & ManyOptions<H, PopulateSpec | undefined>): Promise<Array<LocalizedDoc<PopulatedDocument<DocumentFromHandle<H>, PopulateFromOptions<O>>>>>;
-export declare function paginate<const H extends ContentCollectionHandle | string, O extends PaginationOptions<H, PopulateSpec | undefined>>(handle: H, options: O): Promise<PaginationResult<PopulatedDocument<DocumentFromHandle<H>, PopulateFromOptions<O>>>>;
-export declare function backlinks<const Target extends ContentCollectionHandle | string, const Source extends BacklinkSource | ReadonlyArray<BacklinkSource>, P extends PopulateSpec | undefined = undefined>(handle: Target, options: BacklinksOptions<Target, Source, P>): Promise<BacklinksResult<Source, P>>;
-export declare function variants<H extends ContentCollectionHandle | string>(handle: H, options: VariantsOptions<H>): Promise<Array<ContentVariant<H extends {
+export declare function resolveOne<const H extends ContentCollectionTarget, O extends ResolveOneOptions<H, PopulateSpec | undefined>>(handle: H, options: O): Promise<ResolveOneResult<PopulatedDocument<DocumentFromHandle<H>, PopulateFromOptions<O>>>>;
+export declare function one<const H extends ContentCollectionTarget, O extends OneOptions<H, PopulateSpec | undefined>>(handle: H, options: O): Promise<LocalizedDoc<PopulatedDocument<DocumentFromHandle<H>, PopulateFromOptions<O>>> | null>;
+export declare function many<const H extends ContentCollectionTarget, O extends ManyOptions<H, PopulateSpec | undefined>>(handle: H, options?: O & ManyOptions<H, PopulateSpec | undefined>): Promise<Array<LocalizedDoc<PopulatedDocument<DocumentFromHandle<H>, PopulateFromOptions<O>>>>>;
+export declare function paginate<const H extends ContentCollectionTarget, O extends PaginationOptions<H, PopulateSpec | undefined>>(handle: H, options: O): Promise<PaginationResult<PopulatedDocument<DocumentFromHandle<H>, PopulateFromOptions<O>>>>;
+export declare function backlinks<const Target extends ContentCollectionTarget, const Source extends BacklinkSource | ReadonlyArray<BacklinkSource>, P extends PopulateSpec | undefined = undefined>(handle: Target, options: BacklinksOptions<Target, Source, P>): Promise<BacklinksResult<Source, P>>;
+export declare function variants<H extends ContentCollectionTarget>(handle: H, options: VariantsOptions<H>): Promise<Array<ContentVariant<H extends {
     __schema: {
         _output: infer O;
     };
 } ? O & ParsedContent : ParsedContent>>>;
-export declare function tree<H extends ContentCollectionHandle | string, Fields extends ReadonlyArray<string> | undefined = undefined>(handle: H, options?: Omit<TreeOptions<H>, 'fields'> & {
+export declare function tree<H extends ContentCollectionTarget, Fields extends ReadonlyArray<string> | undefined = undefined>(handle: H, options?: Omit<TreeOptions<H>, 'fields'> & {
     fields?: Fields;
 }): Promise<ContentTreeItem<H extends {
     __schema: {
         _output: infer O;
     };
 } ? O & ParsedContent : ParsedContent, Fields>[]>;
-export declare function neighbors<H extends ContentCollectionHandle | string>(handle: H, options: NeighborsOptions<H>): Promise<NeighborsResult<H extends {
+export declare function neighbors<H extends ContentCollectionTarget>(handle: H, options: NeighborsOptions<H>): Promise<NeighborsResult<H extends {
     __schema: {
         _output: infer O;
     };

package/dist/runtime/app/composables/search.d.ts

@@ -1,9 +1,9 @@
 import type { ComputedRef, Ref } from 'vue';
 import type { MaybeRefOrGetter } from '#imports';
 import { ref } from '#imports';
-import type { ContentCollectionMap } from '@lupinum/ginko-content';
+import type { ContentCollectionHandle } from '../../../types/config';
 import type { ContentNavigationItem } from '../../../types/content';
-import type { ContentSearchSection } from '../../../types/query';
+import type { ContentCollectionMap, ContentCollectionStringName, ContentSearchSection } from '../../../types/query';
 import type { ContentSearchResult } from '../../../types/search';
 export interface UseContentSearchResultsOptions {
     locale?: MaybeRefOrGetter<string | undefined>;
@@ -52,7 +52,7 @@ export interface UseContentSearchDataResult {
     navigation: ComputedRef<ContentNavigationItem[]>;
     searchTerm: ReturnType<typeof ref<string>>;
 }
-export declare function useContentSearchData<K extends keyof ContentCollectionMap & string>(collection: K, options?: UseContentSearchDataOptions): Promise<UseContentSearchDataResult>;
-export declare function useContentSearchData(collection: string, options?: UseContentSearchDataOptions): Promise<UseContentSearchDataResult>;
+export declare function useContentSearchData<K extends keyof ContentCollectionMap & string>(collection: ContentCollectionHandle<K> | K, options?: UseContentSearchDataOptions): Promise<UseContentSearchDataResult>;
+export declare function useContentSearchData(collection: ContentCollectionStringName | ContentCollectionHandle, options?: UseContentSearchDataOptions): Promise<UseContentSearchDataResult>;
 export declare const useContentSearchResults: (search: MaybeRefOrGetter<string>, options?: UseContentSearchResultsOptions) => Promise<UseContentSearchResultsResult>;
 export declare const useContentSearch: (options?: UseContentSearchOptions) => Promise<UseContentSearchResult>;

package/dist/runtime/app/composables/search.js

@@ -13,7 +13,7 @@ const defaultSearchConfig = {
   engine: "minisearch",
   minisearch: {
     fields: ["title", "content", "headings"],
-    storeFields: ["path", "title", "excerpt", "anchor", "locale"],
+    storeFields: ["path", "title", "excerpt", "anchor", "locale", "collection"],
     boost: {
       title: 4,
       headings: 2,
@@ -95,14 +95,16 @@ const loadSearchSections = async (collection, options) => {
     }
   });
 };
+const collectionName = (collection) => typeof collection === "string" ? collection : collection.name;
 export async function useContentSearchData(collection, options = {}) {
+  const name = collectionName(collection);
   const searchTerm = ref("");
   const locale = computed(() => toValue(options.locale));
-  const payload = await useAsyncData(computed(() => `content-search-data:${collection}:${locale.value || "default"}`), async () => {
+  const payload = await useAsyncData(computed(() => `content-search-data:${name}:${locale.value || "default"}`), async () => {
     const locale2 = toValue(options.locale);
     const [navigation, files2] = await Promise.all([
-      tree(collection, locale2 ? { locale: locale2 } : {}),
-      loadSearchSections(collection, options)
+      tree(name, locale2 ? { locale: locale2 } : {}),
+      loadSearchSections(name, options)
     ]);
     return {
       files: files2,
@@ -239,7 +241,10 @@ const useCmsSearch = async (search, apiBaseURL, options) => {
   });
   const { data, pending, error } = await useFetch(requestUrl);
   return {
-    results: computed(() => data.value || []),
+    results: computed(() => (data.value || []).map((result) => ({
+      ...result,
+      collection: typeof result.collection === "string" ? result.collection : ""
+    }))),
     pending: computed(() => pending.value),
     error: computed(() => error.value)
   };
@@ -292,6 +297,7 @@ const usePagefindSearch = (search, pagefindUrl, options) => {
         const [path = "", anchor] = String(data?.url || "").split("#");
         return {
           path,
+          collection: typeof data?.meta?.collection === "string" ? data.meta.collection : "",
           title: data?.meta?.title || path,
           excerpt: data?.excerpt || "",
           score: result.score,

package/dist/runtime/app/composables/use-content.d.ts

@@ -1,7 +1,6 @@
 import type { ComputedRef, MaybeRefOrGetter } from 'vue';
 import { createError } from '#imports';
-import type { ContentCollectionHandle } from '../../../types/config';
-import type { BacklinksOptions, BacklinksResult, BacklinkSource, ContentVariant, ContentTreeItem, ContentResolvedMeta, DocumentFromHandle, LocalePathEntry, LocaleFallback, ManyOptions, LocalizedDoc, NeighborsOptions, NeighborsResult, OneOptions, PopulateSpec, PopulateFromOptions, PopulatedDocument, PaginationOptions, PaginationResult, ResolveOneOptions, ResolveOneResult, SortSpec, TreeOptions, VariantsOptions } from '../../../types/query';
+import type { BacklinksOptions, BacklinksResult, BacklinkSource, ContentCollectionTarget, ContentVariant, ContentTreeItem, ContentResolvedMeta, DocumentFromHandle, LocalePathEntry, LocaleFallback, ManyOptions, LocalizedDoc, NeighborsOptions, NeighborsResult, OneOptions, PopulateSpec, PopulateFromOptions, PopulatedDocument, PaginationOptions, PaginationResult, ResolveOneOptions, ResolveOneResult, SortSpec, TreeOptions, VariantsOptions } from '../../../types/query';
 type ReactiveLeaf<T> = T | MaybeRefOrGetter<T>;
 type ReactiveValue<V> = V extends ((...args: never[]) => unknown) | readonly unknown[] ? ReactiveLeaf<V> : V extends object | undefined ? ReactiveLeaf<V> | {
     [P in keyof NonNullable<V>]?: ReactiveLeaf<NonNullable<V>[P]>;
@@ -22,7 +21,7 @@ interface UseContentOneReturn<T> {
  * `options` changes. Caching follows Nuxt's standard `useAsyncData` semantics
  * keyed by `${collection}:${stableHash(options)}`.
  */
-export declare function useContentOne<const H extends ContentCollectionHandle | string, O extends OneOptions<H, PopulateSpec | undefined>>(handle: H, options: Reactive<O>): Promise<UseContentOneReturn<PopulatedDocument<DocFromHandle<H>, PopulateFromOptions<O>>>>;
+export declare function useContentOne<const H extends ContentCollectionTarget, O extends OneOptions<H, PopulateSpec | undefined>>(handle: H, options: Reactive<O>): Promise<UseContentOneReturn<PopulatedDocument<DocFromHandle<H>, PopulateFromOptions<O>>>>;
 type ContentPageSurroundOptions<H> = boolean | Omit<NeighborsOptions<H>, 'by' | 'locale' | 'fallback'>;
 type ContentPageOneOptions<H, P extends PopulateSpec | undefined> = Omit<OneOptions<H, P>, 'by' | 'locale' | 'fallback'> & {
     /**
@@ -37,7 +36,7 @@ export type UseContentPageOptions<H = unknown, P extends PopulateSpec | undefine
     /**
      * Load previous/next items alongside the page.
      *
-     * Pass `true` for the default neighbor query, or an options object to choose
+     * Pass `true` for the default surround query, or an options object to choose
      * fields. The page query remains one request unless this is enabled.
      */
     surround?: ContentPageSurroundOptions<H>;
@@ -48,8 +47,11 @@ export type UseContentPageOptions<H = unknown, P extends PopulateSpec | undefine
     notFound?: false | (() => Parameters<typeof createError>[0]);
 };
 interface UseContentPageReturn<T> {
+    data: ComputedRef<LocalizedDoc<T> | undefined>;
     page: ComputedRef<LocalizedDoc<T> | undefined>;
-    surround: ComputedRef<Array<ContentTreeItem<T> | null>>;
+    previous: ComputedRef<ContentTreeItem<T> | null>;
+    next: ComputedRef<ContentTreeItem<T> | null>;
+    surround: ComputedRef<Array<ContentTreeItem<T>>>;
     pending: ComputedRef<boolean>;
     status: ComputedRef<string>;
     error: ComputedRef<unknown>;
@@ -60,7 +62,7 @@ interface UseContentPageReturn<T> {
  * components; the explicit `useContentOne` selector remains the lower-level
  * primitive for custom reads.
  */
-export declare function useContentPage<const H extends ContentCollectionHandle | string, P extends PopulateSpec | undefined = undefined>(handle: H, options?: UseContentPageOptions<H, P>): Promise<UseContentPageReturn<PopulatedDocument<DocFromHandle<H>, P>>>;
+export declare function useContentPage<const H extends ContentCollectionTarget, P extends PopulateSpec | undefined = undefined>(handle: H, options?: UseContentPageOptions<H, P>): Promise<UseContentPageReturn<PopulatedDocument<DocFromHandle<H>, P>>>;
 interface UseContentResolveOneReturn<T> {
     doc: ComputedRef<LocalizedDoc<T> | null>;
     explain: ComputedRef<ResolveOneResult<T>['explain'] | null>;
@@ -71,7 +73,7 @@ interface UseContentResolveOneReturn<T> {
 /**
  * Reactively resolve a single document with a first-class diagnostic envelope.
  */
-export declare function useContentResolveOne<const H extends ContentCollectionHandle | string, O extends ResolveOneOptions<H, PopulateSpec | undefined>>(handle: H, options: Reactive<O>): Promise<UseContentResolveOneReturn<PopulatedDocument<DocFromHandle<H>, PopulateFromOptions<O>>>>;
+export declare function useContentResolveOne<const H extends ContentCollectionTarget, O extends ResolveOneOptions<H, PopulateSpec | undefined>>(handle: H, options: Reactive<O>): Promise<UseContentResolveOneReturn<PopulatedDocument<DocFromHandle<H>, PopulateFromOptions<O>>>>;
 interface UseContentManyReturn<T> {
     data: ComputedRef<Array<LocalizedDoc<T>>>;
     status: ComputedRef<string>;
@@ -95,11 +97,11 @@ interface UseContentPaginationReturn<T> {
 /**
  * Reactively resolve a list of documents.
  */
-export declare function useContentMany<const H extends ContentCollectionHandle | string, O extends ManyOptions<H, PopulateSpec | undefined>>(handle: H, options?: Reactive<O>): Promise<UseContentManyReturn<PopulatedDocument<DocFromHandle<H>, PopulateFromOptions<O>>>>;
+export declare function useContentMany<const H extends ContentCollectionTarget, O extends ManyOptions<H, PopulateSpec | undefined>>(handle: H, options?: Reactive<O>): Promise<UseContentManyReturn<PopulatedDocument<DocFromHandle<H>, PopulateFromOptions<O>>>>;
 /**
  * Reactively resolve one page of documents plus total/page navigation metadata.
  */
-export declare function useContentPagination<const H extends ContentCollectionHandle | string, O extends PaginationOptions<H, PopulateSpec | undefined>>(handle: H, options: Reactive<O>): Promise<UseContentPaginationReturn<PopulatedDocument<DocFromHandle<H>, PopulateFromOptions<O>>>>;
+export declare function useContentPagination<const H extends ContentCollectionTarget, O extends PaginationOptions<H, PopulateSpec | undefined>>(handle: H, options: Reactive<O>): Promise<UseContentPaginationReturn<PopulatedDocument<DocFromHandle<H>, PopulateFromOptions<O>>>>;
 interface UseContentBacklinksReturn<T> {
     data: ComputedRef<T[]>;
     status: ComputedRef<string>;
@@ -109,7 +111,7 @@ interface UseContentBacklinksReturn<T> {
 /**
  * Reactively resolve source documents that reference a target document.
  */
-export declare function useContentBacklinks<const Target extends ContentCollectionHandle | string, const Source extends BacklinkSource | ReadonlyArray<BacklinkSource>, P extends PopulateSpec | undefined = undefined>(handle: Target, options: Reactive<BacklinksOptions<Target, Source, P>> & {
+export declare function useContentBacklinks<const Target extends ContentCollectionTarget, const Source extends BacklinkSource | ReadonlyArray<BacklinkSource>, P extends PopulateSpec | undefined = undefined>(handle: Target, options: Reactive<BacklinksOptions<Target, Source, P>> & {
     from: ReactiveValue<Source>;
 }): Promise<UseContentBacklinksReturn<BacklinksResult<Source, P>[number]>>;
 interface UseContentVariantsReturn<T> {
@@ -123,17 +125,35 @@ interface UseContentVariantsReturn<T> {
  * locale switchers. Returns one entry per configured locale, with a
  * `translated` flag.
  */
-export declare function useContentVariants<H extends ContentCollectionHandle | string>(handle: H, options: Reactive<VariantsOptions<H>>): Promise<UseContentVariantsReturn<DocFromHandle<H>>>;
+export declare function useContentVariants<H extends ContentCollectionTarget>(handle: H, options: Reactive<VariantsOptions<H>>): Promise<UseContentVariantsReturn<DocFromHandle<H>>>;
 interface UseContentTreeReturn<T> {
     data: ComputedRef<T[]>;
     status: ComputedRef<string>;
     error: ComputedRef<unknown>;
     refresh: () => Promise<void>;
 }
+export type ContentNavigationNode<T> = Omit<ContentTreeItem<T>, 'children'> & {
+    id: string;
+    path: string;
+    title: string;
+    children: Array<ContentNavigationNode<T>>;
+};
+interface UseContentNavigationReturn<T> {
+    data: ComputedRef<Array<ContentNavigationNode<T>>>;
+    firstPage: ComputedRef<ContentNavigationNode<T> | null>;
+    paths: ComputedRef<Set<string>>;
+    status: ComputedRef<string>;
+    error: ComputedRef<unknown>;
+    refresh: () => Promise<void>;
+}
 /**
  * Reactively resolve the navigation tree for a collection.
  */
-export declare function useContentTree<H extends ContentCollectionHandle | string>(handle: H, options?: Reactive<TreeOptions<H>>): Promise<UseContentTreeReturn<ContentTreeItem<DocFromHandle<H>>>>;
+export declare function useContentTree<H extends ContentCollectionTarget>(handle: H, options?: Reactive<TreeOptions<H>>): Promise<UseContentTreeReturn<ContentTreeItem<DocFromHandle<H>>>>;
+/**
+ * Reactively resolve normalized navigation for sidebars and active-state UI.
+ */
+export declare function useContentNavigation<H extends ContentCollectionTarget>(handle: H, options?: Reactive<TreeOptions<H>>): Promise<UseContentNavigationReturn<DocFromHandle<H>>>;
 interface UseContentNeighborsReturn<T> {
     data: ComputedRef<NeighborsResult<T>>;
     pending: ComputedRef<boolean>;
@@ -144,7 +164,7 @@ interface UseContentNeighborsReturn<T> {
 /**
  * Reactively resolve previous/next surroundings for a document.
  */
-export declare function useContentNeighbors<H extends ContentCollectionHandle | string>(handle: H, options: Reactive<NeighborsOptions<H>>): Promise<UseContentNeighborsReturn<DocFromHandle<H>>>;
+export declare function useContentNeighbors<H extends ContentCollectionTarget>(handle: H, options: Reactive<NeighborsOptions<H>>): Promise<UseContentNeighborsReturn<DocFromHandle<H>>>;
 interface UseContentLocaleSwitchReturn<T> {
     /**
      * Per-locale path map of the resolved document, keyed by locale code.
@@ -184,5 +204,5 @@ interface UseContentLocaleSwitchReturn<T> {
  * </script>
  * ```
  */
-export declare function useContentLocaleSwitch<const H extends ContentCollectionHandle | string, O extends OneOptions<H, PopulateSpec | undefined>>(handle: H, options: Reactive<O>): Promise<UseContentLocaleSwitchReturn<PopulatedDocument<DocFromHandle<H>, PopulateFromOptions<O>>>>;
-export type { ManyOptions, OneOptions, BacklinksOptions, BacklinksResult, LocalizedDoc, ContentResolvedMeta, DocumentFromHandle, NeighborsOptions, NeighborsResult, PaginationOptions, PaginationResult, PopulateSpec, PopulateFromOptions, PopulatedDocument, ResolveOneOptions, ResolveOneResult, SortSpec, TreeOptions, VariantsOptions, ContentVariant };
+export declare function useContentLocaleSwitch<const H extends ContentCollectionTarget, O extends OneOptions<H, PopulateSpec | undefined>>(handle: H, options: Reactive<O>): Promise<UseContentLocaleSwitchReturn<PopulatedDocument<DocFromHandle<H>, PopulateFromOptions<O>>>>;
+export type { ManyOptions, OneOptions, BacklinksOptions, BacklinksResult, LocalizedDoc, ContentResolvedMeta, ContentCollectionTarget, DocumentFromHandle, NeighborsOptions, NeighborsResult, PaginationOptions, PaginationResult, PopulateSpec, PopulateFromOptions, PopulatedDocument, ResolveOneOptions, ResolveOneResult, SortSpec, TreeOptions, VariantsOptions, ContentVariant };

package/dist/runtime/app/composables/use-content.js

@@ -2,6 +2,7 @@ import { computed, shallowRef, toValue, watch } from "vue";
 import { hash } from "ohash";
 import { createError, useAsyncData, useRoute } from "#imports";
 import { createClientContentQueryContext } from "./query-api.js";
+import { resolveCollectionI18n } from "../../../features/localization/path";
 import {
   backlinks as backlinksWithContext,
   many as manyWithContext,
@@ -12,7 +13,9 @@ import {
   tree as treeWithContext,
   variants as variantsWithContext
 } from "../../query/unified.js";
+import { resolveActiveLocale } from "./locale.js";
 import { useContentRoute } from "./route.js";
+import { getContentRuntime } from "./runtime.js";
 const unwrapDeep = (value, seen = /* @__PURE__ */ new WeakSet()) => {
   if (value === null || value === void 0) return value;
   if (typeof value === "function") return unwrapDeep(toValue(value), seen);
@@ -35,6 +38,7 @@ const resolveOptions = (reactive) => {
   return unwrapDeep(reactive);
 };
 const stableKey = (prefix, name, options) => `${prefix}:${name}:${hash(options)}`;
+const contentCollectionName = (handle) => typeof handle === "string" ? handle : handle.name;
 export async function useContentOne(handle, options) {
   const resolved = computed(() => resolveOptions(options));
   const key = computed(() => stableKey("content-one", typeof handle === "string" ? handle : handle.name, resolved.value));
@@ -61,7 +65,7 @@ const normalizePageNotFound = (notFound) => {
   if (notFound === false) return void 0;
   return createError(notFound ? notFound() : defaultPageNotFound());
 };
-const normalizeSurround = (surround) => {
+const normalizePageSurround = (surround) => {
   if (!surround) return void 0;
   return surround === true ? {} : surround;
 };
@@ -88,6 +92,18 @@ export async function useContentPage(handle, options = {}) {
   const isBrowser = import.meta.client && typeof window !== "undefined";
   const { notFound, surround, ...oneOptions } = options;
   const routeSelector = { route: () => normalizeRoutePath(route.path) };
+  const runtime = getContentRuntime();
+  const activeLocale = computed(() => {
+    const explicitLocale = toValue(oneOptions.locale);
+    if (explicitLocale) {
+      return explicitLocale;
+    }
+    const { locales, defaultLocale } = resolveCollectionI18n(contentCollectionName(handle), runtime);
+    if (!locales.length && !defaultLocale) {
+      return void 0;
+    }
+    return resolveActiveLocale(locales, defaultLocale);
+  });
   const rawPage = shallowRef(null);
   const resolvingRoute = shallowRef(false);
   const sawRouteQueryPending = shallowRef(false);
@@ -98,12 +114,13 @@ export async function useContentPage(handle, options = {}) {
   useContentRoute(page);
   const pageResultPromise = useContentOne(handle, {
     ...oneOptions,
+    locale: () => activeLocale.value,
     by: routeSelector
   });
-  const surroundOptions = normalizeSurround(surround);
-  const neighborResultPromise = surroundOptions ? useContentNeighbors(handle, {
+  const surroundOptions = normalizePageSurround(surround);
+  const surroundResultPromise = surroundOptions ? useContentNeighbors(handle, {
     ...surroundOptions,
-    ..."locale" in oneOptions ? { locale: oneOptions.locale } : {},
+    locale: () => activeLocale.value,
     ..."fallback" in oneOptions ? { fallback: oneOptions.fallback } : {},
     by: routeSelector
   }) : void 0;
@@ -135,30 +152,40 @@ export async function useContentPage(handle, options = {}) {
       }
     }
   });
-  const neighborResult = neighborResultPromise ? await neighborResultPromise : void 0;
-  const pending = computed(() => pageResult.pending.value || Boolean(neighborResult?.pending.value));
+  const surroundResult = surroundResultPromise ? await surroundResultPromise : void 0;
+  const pending = computed(() => pageResult.pending.value || Boolean(surroundResult?.pending.value));
   const pageError = computed(() => {
     if (pageResult.error.value) return pageResult.error.value;
-    if (neighborResult?.error.value) return neighborResult.error.value;
+    if (surroundResult?.error.value) return surroundResult.error.value;
     if (pending.value || resolvingRoute.value || page.value || notFound === false) return void 0;
     return normalizePageNotFound(notFound);
   });
   if (!isBrowser && pageError.value) {
     throw pageError.value;
   }
+  const previous = computed(() => {
+    if (!page.value || !surroundResult) return null;
+    return surroundResult.data.value.prev;
+  });
+  const next = computed(() => {
+    if (!page.value || !surroundResult) return null;
+    return surroundResult.data.value.next;
+  });
+  const pageSurround = computed(() => {
+    return [previous.value, next.value].filter((item) => Boolean(item));
+  });
   return {
+    data: page,
     page,
-    surround: computed(() => {
-      if (!page.value || !neighborResult) return [];
-      const neighbors = neighborResult.data.value;
-      return [neighbors.prev, neighbors.next];
-    }),
+    surround: pageSurround,
+    previous,
+    next,
     pending,
     status: computed(() => pageResult.status.value),
     error: pageError,
     refresh: async () => {
       await pageResult.refresh();
-      if (neighborResult) await neighborResult.refresh();
+      if (surroundResult) await surroundResult.refresh();
     }
   };
 }
@@ -263,6 +290,37 @@ export async function useContentVariants(handle, options) {
     refresh: () => asyncData.refresh()
   };
 }
+const navigationNodeId = (item) => {
+  const id = item.id ?? item._id ?? item._canonicalKey ?? item.path ?? item._path ?? item.title;
+  return typeof id === "string" && id.length ? id : item.title;
+};
+const normalizeContentNavigation = (items = []) => {
+  return items.map((item) => {
+    const source = item;
+    return {
+      ...item,
+      id: navigationNodeId(source),
+      path: item.path,
+      title: item.title,
+      children: normalizeContentNavigation(item.children || [])
+    };
+  });
+};
+const findFirstContentNavigationPage = (items) => {
+  for (const item of items) {
+    if (item.path) return item;
+    const child = findFirstContentNavigationPage(item.children);
+    if (child) return child;
+  }
+  return null;
+};
+const collectContentNavigationPaths = (items, paths = /* @__PURE__ */ new Set()) => {
+  for (const item of items) {
+    if (item.path) paths.add(item.path);
+    collectContentNavigationPaths(item.children, paths);
+  }
+  return paths;
+};
 export async function useContentTree(handle, options = {}) {
   const resolved = computed(() => resolveOptions(options));
   const key = computed(() => stableKey("content-tree", typeof handle === "string" ? handle : handle.name, resolved.value));
@@ -279,6 +337,18 @@ export async function useContentTree(handle, options = {}) {
     refresh: () => asyncData.refresh()
   };
 }
+export async function useContentNavigation(handle, options = {}) {
+  const tree = await useContentTree(handle, options);
+  const data = computed(() => normalizeContentNavigation(tree.data.value));
+  return {
+    data,
+    firstPage: computed(() => findFirstContentNavigationPage(data.value)),
+    paths: computed(() => collectContentNavigationPaths(data.value)),
+    status: tree.status,
+    error: tree.error,
+    refresh: tree.refresh
+  };
+}
 export async function useContentNeighbors(handle, options) {
   const resolved = computed(() => resolveOptions(options));
   const key = computed(() => stableKey("content-neighbors", typeof handle === "string" ? handle : handle.name, resolved.value));

package/dist/runtime/query/unified.d.ts

@@ -27,6 +27,7 @@ export interface RuntimeContentConfig {
             defaultLocale?: string;
         };
         route?: string | Record<string, string>;
+        references?: Record<string, string[]>;
     }>;
 }
 export type ContentQueryEndpoint = 'query' | 'navigation';