@lupinum/ginko-content 0.1.6 → 0.2.0

package/dist/public/provider-query.d.ts

@@ -0,0 +1,58 @@
+/**
+ * Provider wire contract v1 (CS-5).
+ *
+ * The single query envelope crossing the `ContentProvider` boundary. It wraps
+ * the executor-facing `ContentQueryPlan` (see `../core/query/plan.ts`) rather
+ * than the open-ended builder params that used to leak across the seam:
+ *
+ *  - **closed** — no index signatures; every field is named.
+ *  - **versioned** — `v` lets providers reject a wire they do not understand.
+ *  - **JSON-pure** — the plan carries no `RegExp` instances, `Date`s, or
+ *    functions (regex operands are lowered to a tagged JSON object), so the
+ *    whole envelope survives `JSON.parse(JSON.stringify(query))`. The provider
+ *    registry asserts this in dev.
+ *
+ * Providers pattern-match `plan.filter` (a `FilterExpr` tree); they never
+ * parse builder params again.
+ *
+ * The builder-params → wire lowering helpers (`toContentProviderQuery`,
+ * `toContentProviderNavigationQuery`, `PROVIDER_QUERY_VERSION`) live in the
+ * runtime adapter layer (`../runtime/server/provider-query-wire`) so the
+ * internal query IR is not named in the public facade; they are re-exported
+ * here to keep the exported surface stable.
+ */
+import type { ContentQueryPlan } from '../core/query/plan';
+export type { ContentQueryPlan } from '../core/query/plan';
+export { PROVIDER_QUERY_VERSION, toContentProviderQuery, toContentProviderNavigationQuery } from '../runtime/server/provider-query-wire';
+/** The single wire type crossing the provider `query`/`navigationQuery` boundary. */
+export interface ContentProviderQuery {
+    /** Wire version — always `PROVIDER_QUERY_VERSION` (1). */
+    v: 1;
+    /** `null` = cross-collection query (navigation / search aggregation paths). */
+    collection: string | null;
+    plan: ContentQueryPlan;
+}
+/**
+ * Navigation-only knobs that are NOT part of the query plan. Navigation adds
+ * projection fields, a canonical-vs-localized routing flag, and a locale
+ * resolution spec — all of which configure `navigationQuery` tree shaping
+ * rather than document selection, so they travel beside the plan instead of
+ * being smuggled through it.
+ *
+ * `resolveLocale` is carried here in its un-lowered builder shape because
+ * navigation walks the fallback chain itself and must distinguish
+ * `fallback: true` (expand from config) / `false` (exact) / an explicit chain —
+ * a distinction the executor plan intentionally normalizes away.
+ */
+export interface ContentProviderNavigationOptions {
+    /** Extra fields the navigation tree should carry beyond the defaults. */
+    fields?: string[];
+    /** Emit canonical (locale-agnostic) routes instead of localized ones. */
+    canonical?: boolean;
+    /** Locale resolution for the navigation tree, in builder shape. */
+    resolveLocale?: {
+        locale?: string;
+        fallback?: boolean | string[];
+        exact?: boolean;
+    };
+}

package/dist/public/provider-query.js

@@ -0,0 +1,5 @@
+export {
+  PROVIDER_QUERY_VERSION,
+  toContentProviderQuery,
+  toContentProviderNavigationQuery
+} from "../runtime/server/provider-query-wire";

package/dist/public/provider.d.ts

@@ -2,11 +2,16 @@ import type { H3Event } from 'h3';
 import type { ContentQueryResponse } from '../types/api';
 import type { NavItem, ParsedContent } from '../types/content';
 import type { ContentProviderName } from '../types/config';
-import type { ContentCollectionItemSurroundingsOptions, ContentCollectionNavigationOptions, ContentCollectionPageOptions, ContentCollectionRouteMetaOptions, ContentCollectionSearchSectionsOptions, ContentPageResult, ContentQueryBuilderParams, ContentRouteMeta, ContentSearchSection, ContentSitemapEntry } from '../types/query';
+import type { ContentCollectionItemSurroundingsOptions, ContentCollectionNavigationOptions, ContentCollectionPageOptions, ContentCollectionRouteMetaOptions, ContentCollectionSearchSectionsOptions, ContentPageResult, ContentRouteMeta, ContentSearchSection, ContentSitemapEntry } from '../types/query';
 import type { QueryCollectionsSitemapEntriesOptions } from '../features/sitemap/query';
 import type { ContentProviderSearchRequest, ContentSearchResult } from '../types/search';
 import type { ContentCacheHint, ContentCacheHintInput } from '../core/cache-hints';
+import type { ContentProviderNavigationOptions, ContentProviderQuery } from './provider-query';
 export type { ContentCacheHint, ContentCacheHintInput } from '../core/cache-hints';
+export type { ContentProviderQuery, ContentProviderNavigationOptions, ContentQueryPlan } from './provider-query';
+export { PROVIDER_QUERY_VERSION, toContentProviderQuery, toContentProviderNavigationQuery } from './provider-query';
+export { createContentProviderError } from './provider-errors';
+export type { ContentProviderErrorCode } from './provider-errors';
 export declare const contentProviderResultMarker = "__ginkoContentProviderResult";
 export interface ContentProviderResult<T = unknown> {
     readonly [contentProviderResultMarker]: true;
@@ -53,8 +58,8 @@ export interface ContentProviderCapabilities {
 export interface ContentProvider {
     name: ContentProviderName;
     capabilities: ContentProviderCapabilities;
-    query: <T = ParsedContent>(event: H3Event, query: ContentQueryBuilderParams) => Promise<MaybeContentProviderResult<ContentQueryResponse<T>>>;
-    navigationQuery?: (event: H3Event, query: ContentQueryBuilderParams) => Promise<MaybeContentProviderResult<NavItem[]>>;
+    query: <T = ParsedContent>(event: H3Event, query: ContentProviderQuery) => Promise<MaybeContentProviderResult<ContentQueryResponse<T>>>;
+    navigationQuery?: (event: H3Event, query: ContentProviderQuery, options?: ContentProviderNavigationOptions) => Promise<MaybeContentProviderResult<NavItem[]>>;
     navigation?: (event: H3Event, collection: string, options?: string[] | ContentCollectionNavigationOptions) => Promise<MaybeContentProviderResult<NavItem[]>>;
     surroundings?: (event: H3Event, collection: string, path: string, options?: ContentCollectionItemSurroundingsOptions) => Promise<MaybeContentProviderResult<Array<NavItem | null>>>;
     searchSections?: (event: H3Event, collection: string, options?: ContentCollectionSearchSectionsOptions) => Promise<MaybeContentProviderResult<ContentSearchSection[]>>;

package/dist/public/provider.js

@@ -1,3 +1,5 @@
+export { PROVIDER_QUERY_VERSION, toContentProviderQuery, toContentProviderNavigationQuery } from "./provider-query.js";
+export { createContentProviderError } from "./provider-errors.js";
 export const contentProviderResultMarker = "__ginkoContentProviderResult";
 export const withContentCache = (data, cache) => ({
   [contentProviderResultMarker]: true,

package/dist/public/server.d.ts

@@ -6,19 +6,14 @@
  * re-exported here for ergonomic discoverability from `@lupinum/ginko-content/server`.
  */
 export { one, many, paginate, backlinks, resolveOne, variants, tree, neighbors, createServerContentQueryContext } from '../runtime/server/query-api.js';
-export { getCollectionPath } from '../runtime/query/routes.js';
-export type { CollectionPathOptions } from '../runtime/query/routes.js';
-export { agentMarkdownPathForRoute, agentRawPathForRoute, normalizeAgentRoutePath } from '../runtime/agent-paths.js';
-export { clearAgentMarkdownSerializers, blockquoteMarkdown, defineAgentMarkdownComponent, getMarkdownProp, jsonFenceMarkdown, linkMarkdown, queryMarkdownEnabledContent, registerAgentMarkdownComponent, registerAgentMarkdownComponents, registerAgentMarkdownSerializer, registerAgentMarkdownSerializers, renderMarkdownChildren, resolveAgentMarkdownOptions, resolveContentMarkdown, resolveContentMarkdownByRoute, xmlComponentMarkdown } from '../runtime/server/agent-markdown.js';
-export { buildAgentPageIndex, collectAgentMarkdownPrerenderRoutes, getAgentLocales, isSupportedAgentLocale, localeFromAgentPath, renderAgentMarkdownFrontmatter, renderAgentMarkdownPage, renderLlmsFullTxt, renderLlmsTxt, resolveMarkdownForPublicRoute, routePathFromIndexSlug, routePathFromRawSlug } from '../runtime/server/agent-site.js';
-export type { AgentMarkdown, AgentMarkdownComponent, AgentMarkdownComponentMap, AgentMarkdownContext, AgentMarkdownMeta, AgentMarkdownPublicSignals, AgentMarkdownSerializer, AgentMarkdownSerializerMap, ResolvedAgentMarkdownOptions } from '../runtime/server/agent-markdown.js';
-export type { AgentPage, AgentPageSource } from '../runtime/server/agent-site.js';
-export type { QueryWhere, QueryOperators, ContentSelector, ContentPageResult, ContentQueryBuilderParams, ContentRouteMeta, ContentSearchSection, ContentResolvedMeta, ContentSitemapEntry, BacklinkFields, BacklinkSource, BacklinksOptions, BacklinksResult, LocaleFallback, DocumentFromHandle, OneOptions, ManyOptions, PaginationOptions, PaginationResult, PopulateSpec, PopulatedDocument, ResolveOneOptions, ResolveOneResult, LocalizedDoc, LocalizedContentDocument, LocalePathEntry, NeighborsOptions, NeighborsResult, SortSpec, TreeOptions, VariantsOptions, ContentVariant } from '../types/query.js';
+export { getCollectionPath } from '../features/query/routes.js';
+export type { CollectionPathOptions } from '../features/query/routes.js';
+export type { QueryWhere, QueryOperators, ContentSelector, ContentPageResult, ContentRouteMeta, ContentSearchSection, ContentResolvedMeta, ContentSitemapEntry, BacklinkFields, BacklinkSource, BacklinksOptions, BacklinksResult, LocaleFallback, DocumentFromHandle, OneOptions, ManyOptions, PaginationOptions, PaginationResult, PopulateSpec, PopulatedDocument, ResolveOneOptions, ResolveOneResult, LocalizedDoc, LocalizedContentDocument, LocalePathEntry, NeighborsOptions, NeighborsResult, SortSpec, TreeOptions, VariantsOptions, ContentVariant } from '../types/query.js';
 export type { ContentQueryResponse } from '../types/api.js';
 export declare const queryCollectionsSitemapEntries: typeof import('../runtime/server/sitemap-provider.js').queryCollectionsSitemapEntries;
 export { createContentProviderError } from './provider-errors.js';
-export { contentCacheHeaders, noopContentCache, vercelContentCache, type VercelContentCacheOptions } from '../runtime/server/cache-adapters.js';
+export { contentCacheHeaders, noopContentCache, vercelContentCache, headersContentCache, type VercelContentCacheOptions } from '../runtime/server/cache-adapters.js';
 export { clearContentCacheHint, collectContentCacheHint, getContentCacheHint } from '../runtime/server/cache-hints.js';
-export type { ContentCacheAdapter, ContentCacheHint, ContentCacheHintInput, ContentCacheInvalidateInput, ContentProvider, ContentProviderCapabilities, ContentProviderResult, MaybeContentProviderResult } from './provider.js';
-export { withContentCache } from './provider.js';
-export type { ContentProviderErrorCode } from './provider-errors.js';
+export { PROVIDER_QUERY_VERSION, toContentProviderNavigationQuery, toContentProviderQuery, withContentCache } from './provider.js';
+export { normalizeProviderDocument, shapeProviderDocument } from '../runtime/server/provider-document.js';
+export type { ProviderDocumentInput, ShapeProviderDocumentOptions } from '../runtime/server/provider-document.js';

package/dist/public/server.js

@@ -9,40 +9,7 @@ export {
   neighbors,
   createServerContentQueryContext
 } from "../runtime/server/query-api.js";
-export { getCollectionPath } from "../runtime/query/routes.js";
-export { agentMarkdownPathForRoute, agentRawPathForRoute, normalizeAgentRoutePath } from "../runtime/agent-paths.js";
-export {
-  clearAgentMarkdownSerializers,
-  blockquoteMarkdown,
-  defineAgentMarkdownComponent,
-  getMarkdownProp,
-  jsonFenceMarkdown,
-  linkMarkdown,
-  queryMarkdownEnabledContent,
-  registerAgentMarkdownComponent,
-  registerAgentMarkdownComponents,
-  registerAgentMarkdownSerializer,
-  registerAgentMarkdownSerializers,
-  renderMarkdownChildren,
-  resolveAgentMarkdownOptions,
-  resolveContentMarkdown,
-  resolveContentMarkdownByRoute,
-  xmlComponentMarkdown
-} from "../runtime/server/agent-markdown.js";
-export {
-  buildAgentPageIndex,
-  collectAgentMarkdownPrerenderRoutes,
-  getAgentLocales,
-  isSupportedAgentLocale,
-  localeFromAgentPath,
-  renderAgentMarkdownFrontmatter,
-  renderAgentMarkdownPage,
-  renderLlmsFullTxt,
-  renderLlmsTxt,
-  resolveMarkdownForPublicRoute,
-  routePathFromIndexSlug,
-  routePathFromRawSlug
-} from "../runtime/server/agent-site.js";
+export { getCollectionPath } from "../features/query/routes.js";
 export const queryCollectionsSitemapEntries = async (...args) => {
   const { queryCollectionsSitemapEntries: queryCollectionsSitemapEntries2 } = await import("../runtime/server/sitemap-provider.js");
   return await queryCollectionsSitemapEntries2(...args);
@@ -51,11 +18,13 @@ export { createContentProviderError } from "./provider-errors.js";
 export {
   contentCacheHeaders,
   noopContentCache,
-  vercelContentCache
+  vercelContentCache,
+  headersContentCache
 } from "../runtime/server/cache-adapters.js";
 export {
   clearContentCacheHint,
   collectContentCacheHint,
   getContentCacheHint
 } from "../runtime/server/cache-hints.js";
-export { withContentCache } from "./provider.js";
+export { PROVIDER_QUERY_VERSION, toContentProviderNavigationQuery, toContentProviderQuery, withContentCache } from "./provider.js";
+export { normalizeProviderDocument, shapeProviderDocument } from "../runtime/server/provider-document.js";

package/dist/runtime/app/components/ContentRenderer.d.vue.ts

@@ -19,7 +19,7 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         default: undefined;
     };
     class: {
-        type: (ObjectConstructor | StringConstructor | ArrayConstructor)[];
+        type: (ArrayConstructor | ObjectConstructor | StringConstructor)[];
         default: undefined;
     };
     unwrap: {
@@ -45,7 +45,7 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         default: undefined;
     };
     class: {
-        type: (ObjectConstructor | StringConstructor | ArrayConstructor)[];
+        type: (ArrayConstructor | ObjectConstructor | StringConstructor)[];
         default: undefined;
     };
     unwrap: {
@@ -55,8 +55,8 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
 }>> & Readonly<{}>, {
     excerpt: boolean;
     value: Record<string, any>;
+    tag: string;
     class: string | unknown[] | Record<string, any>;
     prose: boolean;
-    tag: string;
     unwrap: string | boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dist/runtime/app/components/ContentRenderer.vue

@@ -12,7 +12,7 @@ function normalizeBody(value, excerpt) {
   return null;
 }
 function warnUnsupportedValue(value, excerpt) {
-  const path = value?._path ? ` for "${value._path}"` : "";
+  const path = value?.path ? ` for "${value.path}"` : "";
   const target = excerpt ? "excerpt" : "body";
   console.warn(
     `[ginko-content] <ContentRenderer> could not render ${target}${path}. Pass the full content document with a markdown body, or provide an \`empty\` slot for empty/unsupported content.`
@@ -52,7 +52,7 @@ export default defineComponent({
       () => props.excerpt,
       (newExcerpt) => {
         if (newExcerpt && !props.value?.excerpt) {
-          console.warn(`No excerpt found for document content/${props?.value?._path}.${props?.value?._extension}!`);
+          console.warn(`No excerpt found for document content/${props?.value?.path}.${props?.value?.file?.extension}!`);
           console.warn("Make sure to use <!--more--> in your content if you want to use excerpt feature.");
         }
       },

package/dist/runtime/app/components/ContentRenderer.vue.d.ts

@@ -19,7 +19,7 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         default: undefined;
     };
     class: {
-        type: (ObjectConstructor | StringConstructor | ArrayConstructor)[];
+        type: (ArrayConstructor | ObjectConstructor | StringConstructor)[];
         default: undefined;
     };
     unwrap: {
@@ -45,7 +45,7 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         default: undefined;
     };
     class: {
-        type: (ObjectConstructor | StringConstructor | ArrayConstructor)[];
+        type: (ArrayConstructor | ObjectConstructor | StringConstructor)[];
         default: undefined;
     };
     unwrap: {
@@ -55,8 +55,8 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
 }>> & Readonly<{}>, {
     excerpt: boolean;
     value: Record<string, any>;
+    tag: string;
     class: string | unknown[] | Record<string, any>;
     prose: boolean;
-    tag: string;
     unwrap: string | boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dist/runtime/app/components/ContentRendererInline.d.vue.ts

@@ -41,9 +41,9 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         default: () => {};
     };
 }>> & Readonly<{}>, {
+    tag: string;
     components: Record<string, any>;
     prose: boolean;
-    tag: string;
     unwrap: string | boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const _default: typeof __VLS_export;

package/dist/runtime/app/components/ContentRendererInline.vue.d.ts

@@ -41,9 +41,9 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         default: () => {};
     };
 }>> & Readonly<{}>, {
+    tag: string;
     components: Record<string, any>;
     prose: boolean;
-    tag: string;
     unwrap: string | boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const _default: typeof __VLS_export;

package/dist/runtime/app/components/Prose/ProseImg.d.vue.ts

@@ -12,11 +12,11 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         default: undefined;
     };
     width: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: undefined;
     };
     height: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: undefined;
     };
     loading: {
@@ -37,11 +37,11 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         default: undefined;
     };
     width: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: undefined;
     };
     height: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: undefined;
     };
     loading: {

package/dist/runtime/app/components/Prose/ProseImg.vue.d.ts

@@ -12,11 +12,11 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         default: undefined;
     };
     width: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: undefined;
     };
     height: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: undefined;
     };
     loading: {
@@ -37,11 +37,11 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         default: undefined;
     };
     width: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: undefined;
     };
     height: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: undefined;
     };
     loading: {

package/dist/runtime/app/components/Prose/ProsePre.d.vue.ts

@@ -62,8 +62,8 @@ declare const __VLS_base: import("vue").DefineComponent<import("vue").ExtractPro
     };
 }>> & Readonly<{}>, {
     code: string;
-    meta: string;
     style: string | Record<string, any>;
+    meta: string;
     class: string;
     language: string;
     filename: string;

package/dist/runtime/app/components/Prose/ProsePre.vue.d.ts

@@ -62,8 +62,8 @@ declare const __VLS_base: import("vue").DefineComponent<import("vue").ExtractPro
     };
 }>> & Readonly<{}>, {
     code: string;
-    meta: string;
     style: string | Record<string, any>;
+    meta: string;
     class: string;
     language: string;
     filename: string;

package/dist/runtime/app/components/internal/ContentRendererMarkdown.d.vue.ts

@@ -59,9 +59,9 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
 }>> & Readonly<{}>, {
     excerpt: boolean;
     data: Record<string, any>;
+    tag: string;
     components: Record<string, any>;
     prose: boolean;
-    tag: string;
     unwrap: string | boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const _default: typeof __VLS_export;

package/dist/runtime/app/components/internal/ContentRendererMarkdown.vue

@@ -44,8 +44,8 @@ const runtimeContent = useRuntimeConfig().public?.content || {};
 const attrs = useAttrs();
 const { unwrap: unwrapRoot } = useUnwrap();
 const localePath = useLocalePath();
-const locale = computed(() => props.value.locale || props.value._resolvedLocale || props.value._locale);
-const linkLocale = computed(() => props.value._requestedLocale || locale.value);
+const locale = computed(() => props.value.locale || props.value.resolved?.locale || props.value.locale);
+const linkLocale = computed(() => props.value.resolved?.requestedLocale || locale.value);
 const defaultLocale = computed(() => props.value.defaultLocale || runtimeContent.defaultLocale);
 const locales = computed(() => {
   const variantLocales = Array.isArray(props.value.variants) ? props.value.variants.map((variant) => variant.locale).filter((locale2) => Boolean(locale2)) : [];
@@ -64,7 +64,7 @@ const body = computed(() => {
   }
   const resolvedRefs = resolveMarkdownRenderRefs(
     body2,
-    props.value._resolvedRefs,
+    props.value.resolved?.resolvedRefs,
     runtimeContent.links,
     (route) => localePath(route, linkLocale.value)
   );
@@ -105,7 +105,7 @@ const rendererAttrs = computed(() => {
     :default-locale="defaultLocale"
     :locales="locales"
     :components="resolvedComponents"
-    :data-content-id="debug ? value._id : void 0"
+    :data-content-id="debug ? value.id : void 0"
     v-bind="rendererAttrs"
   />
 </template>

package/dist/runtime/app/components/internal/ContentRendererMarkdown.vue.d.ts

@@ -59,9 +59,9 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
 }>> & Readonly<{}>, {
     excerpt: boolean;
     data: Record<string, any>;
+    tag: string;
     components: Record<string, any>;
     prose: boolean;
-    tag: string;
     unwrap: string | boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const _default: typeof __VLS_export;

package/dist/runtime/app/components/internal/MarkdownRenderer.d.ts

@@ -19,7 +19,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         default: string;
     };
     class: {
-        type: (ObjectConstructor | StringConstructor | ArrayConstructor)[];
+        type: (ArrayConstructor | ObjectConstructor | StringConstructor)[];
         default: undefined;
     };
     dataContentId: {
@@ -58,7 +58,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         default: string;
     };
     class: {
-        type: (ObjectConstructor | StringConstructor | ArrayConstructor)[];
+        type: (ArrayConstructor | ObjectConstructor | StringConstructor)[];
         default: undefined;
     };
     dataContentId: {
@@ -79,12 +79,12 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     };
 }>> & Readonly<{}>, {
     locale: string;
+    tag: string;
     defaultLocale: string;
     locales: string[];
     class: string | unknown[] | Record<string, any>;
     components: Record<string, any>;
     prose: boolean | undefined;
-    tag: string;
     dataContentId: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

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

@@ -1,5 +1,5 @@
 export declare const useContentPreview: () => {
     isEnabled: () => boolean;
-    getPreviewToken: () => any;
+    getPreviewToken: () => string | undefined;
     setPreviewToken: (token: string | undefined) => void;
 };

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

@@ -1,10 +1,10 @@
 import type { ParsedContent } from '../../../types/content';
-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';
+import type { ContentCollectionTarget, ContentVariant, ContentTreeItem, BacklinksOptions, BacklinksResult, BacklinkSource, DocumentFromHandle, ManyOptions, LocalizedDoc, NeighborsOptions, NeighborsResult, OneOptions, OptionsArg, PopulateSpec, PopulateFromOptions, PopulatedDocument, PaginationOptions, PaginationResult, ResolveOneOptions, ResolveOneResult, TreeOptions, VariantsOptions } from '../../../types/query';
+import { type ContentQueryContext } from '../../../features/query/unified';
 export declare const createClientContentQueryContext: () => ContentQueryContext;
 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 many<const H extends ContentCollectionTarget, O extends ManyOptions<H, PopulateSpec | undefined>>(handle: H, ...args: OptionsArg<H, 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 {
@@ -12,9 +12,9 @@ export declare function variants<H extends ContentCollectionTarget>(handle: H, o
         _output: infer O;
     };
 } ? O & ParsedContent : ParsedContent>>>;
-export declare function tree<H extends ContentCollectionTarget, 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, ...args: OptionsArg<H, Omit<TreeOptions<H>, 'fields'> & {
     fields?: Fields;
-}): Promise<ContentTreeItem<H extends {
+}>): Promise<ContentTreeItem<H extends {
     __schema: {
         _output: infer O;
     };

package/dist/runtime/app/composables/query-api.js

@@ -9,7 +9,7 @@ import {
   resolveOne as resolveOneWithContext,
   tree as treeWithContext,
   variants as variantsWithContext
-} from "../../query/unified.js";
+} from "../../../features/query/unified";
 export const createClientContentQueryContext = () => {
   const runtime = getContentRuntime();
   const fetcher = getContentApiFetcher();
@@ -26,7 +26,8 @@ export async function resolveOne(handle, options) {
 export async function one(handle, options) {
   return await oneWithContext(createClientContentQueryContext(), handle, options);
 }
-export async function many(handle, options = {}) {
+export async function many(handle, ...args) {
+  const options = args[0] ?? {};
   return await manyWithContext(createClientContentQueryContext(), handle, options);
 }
 export async function paginate(handle, options) {
@@ -38,7 +39,8 @@ export async function backlinks(handle, options) {
 export async function variants(handle, options) {
   return await variantsWithContext(createClientContentQueryContext(), handle, options);
 }
-export async function tree(handle, options = {}) {
+export async function tree(handle, ...args) {
+  const options = args[0] ?? {};
   return await treeWithContext(createClientContentQueryContext(), handle, options);
 }
 export async function neighbors(handle, options) {

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

@@ -5,7 +5,7 @@ export declare function useContentSwitchLocalePath(): (locale: string) => string
 export declare function useContentRoute(value: MaybeRefOrGetter<ContentRouteValue>): {
     switchLocalePath: (locale: string) => string;
     localePaths: ComputedRef<Record<string, string>>;
-    canonicalPath: ComputedRef<string | undefined>;
+    unprefixedPath: ComputedRef<string | undefined>;
     path: ComputedRef<string | undefined>;
 };
 export {};

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

@@ -25,7 +25,7 @@ const syncPublishedContentRoute = (meta, setI18nParams) => {
   meta[CONTENT_ROUTE_META_KEY] = {
     token: activePublisher.token,
     path: activePublisher.path,
-    canonicalPath: activePublisher.canonicalPath,
+    unprefixedPath: activePublisher.unprefixedPath,
     localePaths: activePublisher.localePaths
   };
   setI18nParams(activePublisher.localeParams);
@@ -46,7 +46,7 @@ const normalizeContentRoute = (value) => {
   }
   return {
     path: value.path,
-    canonicalPath: value.canonicalPath,
+    unprefixedPath: value.unprefixedPath,
     localePaths: stringPaths
   };
 };
@@ -58,7 +58,7 @@ const normalizeRoutePath = (path) => {
 };
 const contentRouteMatches = (contentRoute, path) => {
   const normalizedPath = normalizeRoutePath(path);
-  return normalizeRoutePath(contentRoute.path) === normalizedPath || normalizeRoutePath(contentRoute.canonicalPath) === normalizedPath || Object.values(contentRoute.localePaths).some((localePath) => normalizeRoutePath(localePath) === normalizedPath);
+  return normalizeRoutePath(contentRoute.path) === normalizedPath || normalizeRoutePath(contentRoute.unprefixedPath) === normalizedPath || Object.values(contentRoute.localePaths).some((localePath) => normalizeRoutePath(localePath) === normalizedPath);
 };
 const resolveLocalizedRouteParams = (page, router, route, getRouteBaseName) => {
   if (!page) {
@@ -144,7 +144,7 @@ export function useContentRoute(value) {
   return {
     switchLocalePath: useContentSwitchLocalePath(),
     localePaths: computed(() => activeContentRoute.value?.localePaths || {}),
-    canonicalPath: computed(() => activeContentRoute.value?.canonicalPath),
+    unprefixedPath: computed(() => activeContentRoute.value?.unprefixedPath),
     path: computed(() => activeContentRoute.value?.path)
   };
 }

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

@@ -90,7 +90,7 @@ const loadSearchSections = async (collection, options) => {
     loadPages: async (extraFields) => {
       return await many(collection, {
         ...locale ? { locale } : {},
-        select: ["_path", "title", "description", "body", ...extraFields]
+        select: ["path", "title", "description", "body", ...extraFields]
       });
     }
   });

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

@@ -4,7 +4,7 @@ import { createClientContentQueryContext } from "./query-api.js";
 import {
   one as oneWithContext,
   resolveOne as resolveOneWithContext
-} from "../../query/unified.js";
+} from "../../../features/query/unified";
 import { contentCollectionName, resolveOptions, stableKey } from "./use-content-shared.js";
 export async function useContentOne(handle, options) {
   const resolved = computed(() => resolveOptions(options));

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

@@ -6,7 +6,7 @@ import {
   many as manyWithContext,
   paginate as paginateWithContext,
   variants as variantsWithContext
-} from "../../query/unified.js";
+} from "../../../features/query/unified";
 import { contentCollectionName, resolveOptions, stableKey } from "./use-content-shared.js";
 export async function useContentMany(handle, options = {}) {
   const resolved = computed(() => resolveOptions(options));

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

@@ -2,11 +2,11 @@ import { computed } from "vue";
 import { useAsyncData } from "#imports";
 import { resolveCollectionI18n } from "../../../features/localization/path";
 import { createClientContentQueryContext } from "./query-api.js";
-import { neighbors as neighborsWithContext, tree as treeWithContext } from "../../query/unified.js";
+import { neighbors as neighborsWithContext, tree as treeWithContext } from "../../../features/query/unified";
 import { getContentRoute, getContentRuntime } from "./runtime.js";
 import { contentCollectionName, resolveLocaleFromRoutePath, resolveOptions, stableKey } from "./use-content-shared.js";
 const navigationNodeId = (item) => {
-  const id = item.id ?? item._id ?? item._canonicalKey ?? item.path ?? item._path ?? item.title;
+  const id = item.id ?? item.id ?? item.canonicalKey ?? item.path ?? item.path ?? item.title;
   return typeof id === "string" && id.length ? id : item.title;
 };
 export const normalizeContentNavigation = (items = []) => {