content-query 0.2.0 → 0.3.0

package/README.md

@@ -10,6 +10,7 @@ Use it with your existing framework. Your application owns its routes, layouts,
 - **Flexible sources.** Load local files, use Astro-compatible content loaders, or write your own loader.
 - **Queries and relationships.** Select fields, filter, sort, paginate, and load related entries with validated references.
 - **Markdown rendering.** Request HTML, headings, and syntax highlighting as query payloads, loaded only when a query asks for them.
+- **Optional MDX companion.** [`@content-query/mdx`](https://github.com/yangshun/content-query/tree/main/packages/mdx) supplies React islands and ordinary React document modules with Vite SSR. Core has no MDX or React dependency.
 - **Framework integrations.** Use Vite, Next.js, or the standalone CLI, with content updates during development.
 
 ## Usage
@@ -74,7 +75,7 @@ Version 0.2.0 removes `content.readBody()` and `content.render()`. Request bodie
 | `await content.render("posts", id)`   | `(await content.query.posts.findFirst({ where: { id }, payloads: { _rendered: true } }))?._payloads._rendered` |
 | Fluent queries                        | Add `.withPayload("_rendered")` or `.withPayload("_body")` before the terminal.                                |
 
-Built-in payload names start with an underscore: `_body` and `_rendered`. A query for a missing entry returns `undefined` instead of rejecting with `entry-not-found`, which no longer exists. JSON, YAML, and TOML sources and `file()` collections offer no payloads. Rebuild generated content after upgrading; 0.1 artifacts are rejected.
+Built-in payload names start with an underscore: `_body` and `_rendered`. A query for a missing entry returns `undefined` instead of rejecting with `entry-not-found`, which no longer exists. JSON, YAML, and TOML sources and `file()` collections offer no payloads, and custom loaders typed as `BodyLoader` offer only `_body`. Rebuild generated content after upgrading; 0.1 artifacts are rejected.
 
 ## Documentation
 
@@ -83,10 +84,14 @@ Built-in payload names start with an underscore: `_body` and `_rendered`. A quer
 - [API and usage](https://github.com/yangshun/content-query/blob/main/docs/API.md)
 - [Guides and reference](https://github.com/yangshun/content-query/blob/main/docs/README.md)
 
-The Vite integration supports Vite 8, and the Next.js integration supports Next.js 16. Both integrations are optional; standalone builds and queries require neither framework.
+The Vite integration supports Vite 8, and the Next.js integration supports Next.js 15 and 16. Both integrations are optional; standalone builds and queries require neither framework.
 
 Pass `contentQuery()` directly to Vite or Vite+'s `plugins` array. No `Plugin` type cast is needed; workspace consumers share the pinned toolchain versions in the dependency catalog.
 
 Repository development checks package types and isolated consumers with [tsrs](https://github.com/oxc-project/tsrs). Run `vp run check` in the package directory for formatting, linting, and type checks; build tools use the shared TypeScript 6 compatibility package for its `6.0.3` JavaScript API. Native TypeScript `7.1.0-beta` is available at the repository root as `vp exec tsc`.
 
+Build integrations can reuse the active source session without reading schemas or bodies. `ContentSession.sources()` from `content-query/build` returns an immutable `{ revision, entries: [{ collection, id, filePath? }] }` snapshot; `session.subscribe(listener)` reports successful publications (`{ type: "ready", snapshot }`) and errors (`{ type: "error", error }`) and returns an unsubscribe function. Revisions are opaque and session-scoped. In Vite, `contentQuery().api.prepare()` asynchronously prepares the shared session and returns its source snapshot, and `.api.subscribe()` forwards subsequent events. The [MDX architecture](https://github.com/yangshun/content-query/blob/main/docs/MDX-ARCHITECTURE.md) documents its use by companion integrations.
+
+`prepare()` waits for pending preparation and rejects while validation errors are active. Successful unchanged reads reuse the frozen snapshot; publications supply a new revision. Subscribers can observe errors and recovery, and unsubscribing stops subsequent notifications. Development integrations should let core display recoverable errors without aborting the server or replacing the host's refresh subscription.
+
 Released under the [MIT license](https://github.com/yangshun/content-query/blob/main/LICENSE).

package/dist/{build-Dxz7P1ur.mjs → build-CI4s0oFP.mjs}

@@ -1020,6 +1020,43 @@ async function createSession(options) {
 		outDir: path.resolve(options.root, options.outDir)
 	};
 	const state = {};
+	const sourceListeners = /* @__PURE__ */ new Set();
+	const sourceSnapshots = /* @__PURE__ */ new WeakMap();
+	const sourceOwner = randomUUID();
+	let sourceVersion = 0;
+	/** Detaches and freezes integration metadata without exposing prepared payloads or schemas. */
+	function sources() {
+		if (state.error) throw state.error;
+		if (!state.revision) throw new ContentError({
+			code: "artifact-error",
+			message: "No prepared source revision is available."
+		});
+		let snapshot = sourceSnapshots.get(state.revision);
+		if (!snapshot) {
+			snapshot = Object.freeze({
+				revision: `${sourceOwner}:${++sourceVersion}`,
+				entries: Object.freeze(Object.entries(state.revision.collections).flatMap(([collection, prepared]) => prepared.records.map(({ id }) => {
+					const filePath = prepared.sources?.get(id);
+					return Object.freeze({
+						collection,
+						id,
+						...filePath === void 0 ? {} : { filePath }
+					});
+				})))
+			});
+			sourceSnapshots.set(state.revision, snapshot);
+		}
+		return snapshot;
+	}
+	/** Keeps a consumer notification failure from corrupting successfully prepared content. */
+	function notifySources(event) {
+		const listeners = [...sourceListeners];
+		for (const listener of listeners) try {
+			listener(event);
+		} catch (cause) {
+			console.error("[content-query] Source subscriber failed", cause);
+		}
+	}
 	let registry = {};
 	let loaders = /* @__PURE__ */ new Map();
 	let configDependencies;
@@ -1084,6 +1121,10 @@ async function createSession(options) {
 			message: cause instanceof Error ? cause.message : "Content preparation failed."
 		});
 		options.change?.(state);
+		notifySources({
+			type: "error",
+			error: state.error
+		});
 	}
 	/** Aborts an owned subscription group and attempts every cleanup even when one fails. */
 	async function releaseResources(controller, handlers) {
@@ -1229,6 +1270,10 @@ async function createSession(options) {
 			state.revision = revision;
 			state.error = void 0;
 			options.change?.(state);
+			notifySources({
+				type: "ready",
+				snapshot: sources()
+			});
 		} catch (cause) {
 			if (!disposed && currentGeneration === generation) fail(cause);
 		}
@@ -1282,6 +1327,7 @@ async function createSession(options) {
 	async function dispose() {
 		if (disposed) return;
 		disposed = true;
+		sourceListeners.clear();
 		generation++;
 		attempt?.abort();
 		const failed = (await Promise.allSettled([watcher?.close() ?? Promise.resolve(), releaseSubscriptions()])).find((result) => result.status === "rejected");
@@ -1293,6 +1339,14 @@ async function createSession(options) {
 	}
 	const session = {
 		content: createRuntime(state),
+		sources,
+		subscribe(listener) {
+			if (disposed) throw new Error("Content session has been disposed.");
+			sourceListeners.add(listener);
+			return () => {
+				sourceListeners.delete(listener);
+			};
+		},
 		dispose
 	};
 	internals.set(session, {

package/dist/build-jKnjDjQE.d.mts

@@ -0,0 +1,48 @@
+import { i as InvalidRelationships, o as ContentError, t as Content } from "./content-lwPxE9Yu.mjs";
+import { i as CollectionRegistry } from "./types-BC8gVJ6u.mjs";
+//#region src/preparation/session.d.ts
+/** A local source captured by a successfully prepared content revision. */
+type ContentSourceEntry = Readonly<{
+  collection: string;
+  id: string;
+  filePath?: string;
+}>;
+/** Format-neutral integration metadata; the revision token is opaque and session-scoped. */
+type ContentSourceSnapshot = Readonly<{
+  revision: string;
+  entries: readonly ContentSourceEntry[];
+}>;
+/** Notifications are delivered only after atomic publication, or after a failed attempt. */
+type ContentSourceEvent = {
+  type: "ready";
+  snapshot: ContentSourceSnapshot;
+} | {
+  type: "error";
+  error: ContentError;
+};
+type ContentSession<Registry extends CollectionRegistry = {}> = {
+  content: Content<Registry>;
+  /** Reads the latest successful source snapshot; current preparation errors are rethrown. */
+  sources(): ContentSourceSnapshot;
+  /** Observes subsequent publications and failures; returns an idempotent unsubscribe function. */
+  subscribe(listener: (event: ContentSourceEvent) => void): () => void;
+  dispose(): Promise<void>;
+};
+//#endregion
+//#region src/preparation/build.d.ts
+/** Options shared by standalone content builds and host integrations. */
+type BuildContentOptions = {
+  /** Exact config path; omission discovers one content-query.config.{ts,mts,cts,js,mjs,cjs} file. */
+  config?: string;
+  backend?: "in-memory" | "generated";
+  /** Generated backend output directory, relative to the application root; defaults to ./.content-query. */
+  outDir?: string;
+  watch?: boolean;
+};
+/**
+ * Builds content independently of a bundler; bind the registry through an erased type import.
+ * Generated watch sessions prune previous-run artifacts after their first successful publication.
+ */
+declare function buildContent<Registry extends CollectionRegistry = {}>(...arguments_: InvalidRelationships<Registry> extends never ? [options?: BuildContentOptions] : [invalidRegistry: never]): Promise<ContentSession<Registry>>;
+//#endregion
+export { ContentSourceEvent as a, ContentSourceEntry as i, buildContent as n, ContentSourceSnapshot as o, ContentSession as r, BuildContentOptions as t };

package/dist/build.d.mts

@@ -1,2 +1,2 @@
-import { n as buildContent, r as ContentSession, t as BuildContentOptions } from "./build-DfKd2bpf.mjs";
-export { type BuildContentOptions, type ContentSession, buildContent };
+import { a as ContentSourceEvent, i as ContentSourceEntry, n as buildContent, o as ContentSourceSnapshot, r as ContentSession, t as BuildContentOptions } from "./build-jKnjDjQE.mjs";
+export { type BuildContentOptions, type ContentSession, type ContentSourceEntry, type ContentSourceEvent, type ContentSourceSnapshot, buildContent };

package/dist/build.mjs

@@ -1 +1 @@
-export { n as buildContent } from "./build-Dxz7P1ur.mjs";
+export { n as buildContent } from "./build-CI4s0oFP.mjs";

package/dist/cli.mjs

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 import { t as ContentError } from "./errors-C2iuBM0G.mjs";
-import { t as buildAtRoot } from "./build-Dxz7P1ur.mjs";
+import { t as buildAtRoot } from "./build-CI4s0oFP.mjs";
 import { cac } from "cac";
 //#region package.json
-var version = "0.2.0";
+var version = "0.3.0";
 //#endregion
 //#region src/integrations/cli/arguments.ts
 /** Validates one path option after CAC's automatic numeric conversion. */

package/dist/computed.d.mts

@@ -1,5 +1,5 @@
-import { p as MaybePromise } from "./types-ChaNhj42.mjs";
-import { a as ComputedContext } from "./types-C-kdMblM.mjs";
+import { m as MaybePromise } from "./types-FmUJ3cH1.mjs";
+import { a as ComputedContext } from "./types-BC8gVJ6u.mjs";
 import { StandardSchemaV1 } from "@standard-schema/spec";
 //#region src/computed/text.d.ts
 /** The syntax removed before computing text-derived fields; literal text preserves all characters. */

package/dist/{content-G69dPPuo.d.mts → content-lwPxE9Yu.d.mts}

@@ -1,22 +1,6 @@
 import { n as ContentRenderResult } from "./types-Dh-Sydyw.mjs";
-import { c as Relationship, i as CollectionRegistry, l as RelationshipsOf, s as QueryData } from "./types-C-kdMblM.mjs";
-import { _ as QueryPlan, n as RelationalQueries, t as RelationalCountOptions, u as Query, v as QueryRegistry } from "./relational-types-DgK3rLuw.mjs";
-//#region src/collection/registry-types.d.ts
-type Scalar = string | number | bigint | boolean | Date;
-type Element<Value> = NonNullable<Value> extends readonly (infer Item)[] ? NonNullable<Item> : NonNullable<Value>;
-type Compatible<Left, Right> = NonNullable<Left> extends readonly unknown[] ? NonNullable<Right> extends readonly unknown[] ? false : ScalarCompatible<Left, Right> : ScalarCompatible<Left, Right>;
-type ScalarCompatible<Left, Right> = [Element<Left> | Element<Right>] extends [Scalar] ? [Element<Left>] extends [never] ? true : [Element<Right>] extends [never] ? true : [Extract<Element<Left>, Element<Right>> | Extract<Element<Right>, Element<Left>>] extends [never] ? false : true : false;
-type CheckRelation<Registry extends CollectionRegistry, Name extends keyof Registry, Link extends Relationship> = Link["collection"] extends keyof Registry ? Link["from"] extends keyof QueryData<Registry[Name]> ? Link["to"] extends keyof QueryData<Registry[Link["collection"]]> ? Compatible<QueryData<Registry[Name]>[Link["from"]], QueryData<Registry[Link["collection"]]>[Link["to"]]> extends true ? never : "incompatible-relationship-fields" : "unknown-target-field" : "unknown-source-field" : "unknown-target-collection";
-/** Registry-level relationship checks require the complete inferred collection map. */
-type InvalidRelationships<Registry extends CollectionRegistry> = { [Name in keyof Registry]: { [Link in keyof RelationshipsOf<Registry[Name]>]: RelationshipsOf<Registry[Name]>[Link] extends Relationship ? CheckRelation<Registry, Name, RelationshipsOf<Registry[Name]>[Link]> : "invalid-relationship"; }[keyof RelationshipsOf<Registry[Name]>]; }[keyof Registry];
-//#endregion
-//#region src/query/select.d.ts
-/** A selection whose collection and selected result are inferred when from() is supplied. */
-type SelectFrom<Registry extends CollectionRegistry, Keys extends readonly string[]> = {
-  /** Binds the collection and rejects selected keys that are absent from its prepared data type. */
-  from<Name extends keyof Registry & string>(collection: Name & (Exclude<Keys[number], keyof QueryData<Registry[NoInfer<Name>]>> extends never ? unknown : never)): Query<Registry, Name, Keys extends readonly [] ? QueryData<Registry[Name]> : { [Key in Keys[number]]-?: Key extends keyof QueryData<Registry[Name]> ? QueryData<Registry[Name]>[Key] : never; }, true>;
-};
-//#endregion
+import { c as Relationship, i as CollectionRegistry, l as RelationshipsOf, s as QueryData } from "./types-BC8gVJ6u.mjs";
+import { _ as QueryPlan, n as RelationalQueries, t as RelationalCountOptions, u as Query, v as QueryRegistry } from "./relational-types-B45zM34W.mjs";
 //#region src/shared/errors.d.ts
 type ContentErrorCode = "variant-not-found" | "not-renderable" | "source-error" | "validation-error" | "duplicate-id" | "invalid-reference" | "invalid-query" | "artifact-error" | "render-error";
 type ContentDiagnostic = {
@@ -48,6 +32,22 @@ declare class ContentError extends Error {
   });
 }
 //#endregion
+//#region src/collection/registry-types.d.ts
+type Scalar = string | number | bigint | boolean | Date;
+type Element<Value> = NonNullable<Value> extends readonly (infer Item)[] ? NonNullable<Item> : NonNullable<Value>;
+type Compatible<Left, Right> = NonNullable<Left> extends readonly unknown[] ? NonNullable<Right> extends readonly unknown[] ? false : ScalarCompatible<Left, Right> : ScalarCompatible<Left, Right>;
+type ScalarCompatible<Left, Right> = [Element<Left> | Element<Right>] extends [Scalar] ? [Element<Left>] extends [never] ? true : [Element<Right>] extends [never] ? true : [Extract<Element<Left>, Element<Right>> | Extract<Element<Right>, Element<Left>>] extends [never] ? false : true : false;
+type CheckRelation<Registry extends CollectionRegistry, Name extends keyof Registry, Link extends Relationship> = Link["collection"] extends keyof Registry ? Link["from"] extends keyof QueryData<Registry[Name]> ? Link["to"] extends keyof QueryData<Registry[Link["collection"]]> ? Compatible<QueryData<Registry[Name]>[Link["from"]], QueryData<Registry[Link["collection"]]>[Link["to"]]> extends true ? never : "incompatible-relationship-fields" : "unknown-target-field" : "unknown-source-field" : "unknown-target-collection";
+/** Registry-level relationship checks require the complete inferred collection map. */
+type InvalidRelationships<Registry extends CollectionRegistry> = { [Name in keyof Registry]: { [Link in keyof RelationshipsOf<Registry[Name]>]: RelationshipsOf<Registry[Name]>[Link] extends Relationship ? CheckRelation<Registry, Name, RelationshipsOf<Registry[Name]>[Link]> : "invalid-relationship"; }[keyof RelationshipsOf<Registry[Name]>]; }[keyof Registry];
+//#endregion
+//#region src/query/select.d.ts
+/** A selection whose collection and selected result are inferred when from() is supplied. */
+type SelectFrom<Registry extends CollectionRegistry, Keys extends readonly string[]> = {
+  /** Binds the collection and rejects selected keys that are absent from its prepared data type. */
+  from<Name extends keyof Registry & string>(collection: Name & (Exclude<Keys[number], keyof QueryData<Registry[NoInfer<Name>]>> extends never ? unknown : never)): Query<Registry, Name, Keys extends readonly [] ? QueryData<Registry[Name]> : { [Key in Keys[number]]-?: Key extends keyof QueryData<Registry[Name]> ? QueryData<Registry[Name]>[Key] : never; }, true>;
+};
+//#endregion
 //#region src/runtime/revision.d.ts
 type QueryRecord = Record<string, unknown> & {
   id: string;
@@ -106,4 +106,4 @@ declare function createLiveRuntime(initial: ContentState): {
   update(next: ContentState): void;
 };
 //#endregion
-export { ContentError as a, ContentDiagnostic as i, createLiveRuntime as n, ContentErrorCode as o, PreparedRevision as r, InvalidRelationships as s, Content as t };
+export { ContentDiagnostic as a, InvalidRelationships as i, createLiveRuntime as n, ContentError as o, PreparedRevision as r, ContentErrorCode as s, Content as t };

package/dist/{descriptor-D9Th5hzk.d.mts → descriptor-BUPT2J7X.d.mts}

@@ -1,4 +1,4 @@
-import { p as MaybePromise } from "./types-ChaNhj42.mjs";
+import { m as MaybePromise } from "./types-FmUJ3cH1.mjs";
 //#region src/loaders/descriptor.d.ts
 type GlobOptions = {
   pattern: string | string[];

package/dist/index.d.mts

@@ -1,7 +1,7 @@
-import { a as Loader, c as LoaderLogger, d as MetaStore, f as RecordLoader, i as FileSource, l as LoaderSource, n as DataStore, o as LoaderConfig, p as MaybePromise, r as FileEntrySource, s as LoaderContext, t as DataEntry, u as LoaderWatcher } from "./types-ChaNhj42.mjs";
+import { a as FileSource, c as LoaderContext, d as LoaderWatcher, f as MetaStore, i as FileEntrySource, l as LoaderLogger, m as MaybePromise, n as DataEntry, o as Loader, p as RecordLoader, r as DataStore, s as LoaderConfig, t as BodyLoader, u as LoaderSource } from "./types-FmUJ3cH1.mjs";
 import { n as ContentRenderResult, r as RenderedContent, t as ContentHeading } from "./types-Dh-Sydyw.mjs";
-import { a as ComputedContext, c as Relationship, d as SchemaOutput, i as CollectionRegistry, n as BuiltinPayloads, o as PayloadsOf, r as CollectionDefinition, s as QueryData, t as BuiltinPayloadMarker, u as Schema } from "./types-C-kdMblM.mjs";
-import { n as GlobOptions } from "./descriptor-D9Th5hzk.mjs";
+import { a as ComputedContext, c as Relationship, d as SchemaOutput, i as CollectionRegistry, n as BuiltinPayloads, o as PayloadsOf, r as CollectionDefinition, s as QueryData, t as BuiltinPayloadMarker, u as Schema } from "./types-BC8gVJ6u.mjs";
+import { n as GlobOptions } from "./descriptor-BUPT2J7X.mjs";
 import { StandardSchemaV1 } from "@standard-schema/spec";
 //#region src/collection/source.d.ts
 type CollectionSource = string | ({
@@ -68,11 +68,12 @@ type Defined<SourceSchema extends StandardSchemaV1<unknown, Record<string, unkno
 export declare function defineCollection<const SourceSchema extends StandardSchemaV1<unknown, Record<string, unknown>> | undefined = undefined, const ComputedSchemas extends Record<string, Schema> = {}, const Relationships extends Record<string, Relationship> = {}>(definition: {
   source: RecordSource;
   loader?: never;
-} & CollectionFields<SourceSchema, ComputedSchemas, Relationships, FileSource>): Defined<SourceSchema, ComputedSchemas, Relationships, Loader> & BuiltinPayloadMarker<false>;
+} & CollectionFields<SourceSchema, ComputedSchemas, Relationships, FileSource>): Defined<SourceSchema, ComputedSchemas, Relationships, Loader> & BuiltinPayloadMarker<never>;
 /**
  * Declares fields with inferred schema data and optional loader source metadata, plus relationships.
- * Record loaders such as `file()` carry no built-in `_body` or `_rendered` payloads.
+ * Record loaders such as `file()` carry no built-in `_body` or `_rendered` payloads, and body
+ * loaders carry `_body` without `_rendered`.
  */
-export declare function defineCollection<const SourceSchema extends StandardSchemaV1<unknown, Record<string, unknown>> | undefined = undefined, const ComputedSchemas extends Record<string, Schema> = {}, const Relationships extends Record<string, Relationship> = {}, const ContentLoader extends Loader = Loader>(definition: Definition<SourceSchema, ComputedSchemas, Relationships, ContentLoader>): Defined<SourceSchema, ComputedSchemas, Relationships, ContentLoader> & BuiltinPayloadMarker<[ContentLoader] extends [RecordLoader] ? false : true>;
+export declare function defineCollection<const SourceSchema extends StandardSchemaV1<unknown, Record<string, unknown>> | undefined = undefined, const ComputedSchemas extends Record<string, Schema> = {}, const Relationships extends Record<string, Relationship> = {}, const ContentLoader extends Loader = Loader>(definition: Definition<SourceSchema, ComputedSchemas, Relationships, ContentLoader>): Defined<SourceSchema, ComputedSchemas, Relationships, ContentLoader> & BuiltinPayloadMarker<[ContentLoader] extends [RecordLoader] ? never : [ContentLoader] extends [BodyLoader] ? "_body" : keyof BuiltinPayloads>;
 //#endregion
-export type { BuiltinPayloads, CollectionDefinition, CollectionRegistry, CollectionSource, ComputedContext, ContentHeading, ContentRenderResult, DataEntry, DataStore, FileEntrySource, FileSource, Loader, LoaderConfig, LoaderContext, LoaderLogger, LoaderSource, LoaderWatcher, MaybePromise, MetaStore, PayloadsOf, QueryData, RecordLoader, Relationship, RenderedContent };
+export type { BodyLoader, BuiltinPayloads, CollectionDefinition, CollectionRegistry, CollectionSource, ComputedContext, ContentHeading, ContentRenderResult, DataEntry, DataStore, FileEntrySource, FileSource, Loader, LoaderConfig, LoaderContext, LoaderLogger, LoaderSource, LoaderWatcher, MaybePromise, MetaStore, PayloadsOf, QueryData, RecordLoader, Relationship, RenderedContent };

package/dist/internal.d.mts

@@ -1,7 +1,7 @@
+import { n as createLiveRuntime, o as ContentError, r as PreparedRevision, t as Content } from "./content-lwPxE9Yu.mjs";
 import { n as ContentRenderResult } from "./types-Dh-Sydyw.mjs";
-import { i as CollectionRegistry } from "./types-C-kdMblM.mjs";
-import { a as ContentError, n as createLiveRuntime, r as PreparedRevision, t as Content } from "./content-G69dPPuo.mjs";
-import { v as QueryRegistry } from "./relational-types-DgK3rLuw.mjs";
+import { i as CollectionRegistry } from "./types-BC8gVJ6u.mjs";
+import { v as QueryRegistry } from "./relational-types-B45zM34W.mjs";
 //#region src/artifacts/types.d.ts
 type ArtifactManifest = {
   version: number;

package/dist/loaders.d.mts

@@ -1,5 +1,5 @@
-import { a as Loader, c as LoaderLogger, d as MetaStore, f as RecordLoader, i as FileSource, l as LoaderSource, n as DataStore, o as LoaderConfig, r as FileEntrySource, s as LoaderContext, t as DataEntry, u as LoaderWatcher } from "./types-ChaNhj42.mjs";
-import { n as GlobOptions, t as FileOptions } from "./descriptor-D9Th5hzk.mjs";
+import { a as FileSource, c as LoaderContext, d as LoaderWatcher, f as MetaStore, i as FileEntrySource, l as LoaderLogger, n as DataEntry, o as Loader, p as RecordLoader, r as DataStore, s as LoaderConfig, t as BodyLoader, u as LoaderSource } from "./types-FmUJ3cH1.mjs";
+import { n as GlobOptions, t as FileOptions } from "./descriptor-BUPT2J7X.mjs";
 //#region src/loaders/file.d.ts
 /** Declares a multi-entry data file with typed source paths and record keys, plus an optional parser. */
 export declare function file(filename: string, options?: FileOptions): RecordLoader<FileEntrySource>;
@@ -8,4 +8,4 @@ export declare function file(filename: string, options?: FileOptions): RecordLoa
 /** Declares local files with Astro-style IDs and typed, project-relative source paths. */
 export declare function glob(options: GlobOptions): Loader<FileSource>;
 //#endregion
-export type { DataEntry, DataStore, FileEntrySource, FileOptions, FileSource, GlobOptions, Loader, LoaderConfig, LoaderContext, LoaderLogger, LoaderSource, LoaderWatcher, MetaStore, RecordLoader };
+export type { BodyLoader, DataEntry, DataStore, FileEntrySource, FileOptions, FileSource, GlobOptions, Loader, LoaderConfig, LoaderContext, LoaderLogger, LoaderSource, LoaderWatcher, MetaStore, RecordLoader };

package/dist/next.d.mts

@@ -1,4 +1,4 @@
-import { t as BuildContentOptions } from "./build-DfKd2bpf.mjs";
+import { t as BuildContentOptions } from "./build-jKnjDjQE.mjs";
 import { NextConfig } from "next";
 //#region src/integrations/next/plugin.d.ts
 /** Content locations for Next.js; the adapter chooses generated storage and the watch lifecycle. */

package/dist/next.mjs

@@ -1,4 +1,4 @@
-import { c as contentDeclarations, i as resolveConfigPath, t as buildAtRoot } from "./build-Dxz7P1ur.mjs";
+import { c as contentDeclarations, i as resolveConfigPath, t as buildAtRoot } from "./build-CI4s0oFP.mjs";
 import { n as serializeContentError } from "./diagnostics-Cu94mZhl.mjs";
 import path from "node:path";
 import { randomUUID } from "node:crypto";

package/dist/query.d.mts

@@ -1,4 +1,4 @@
-import { a as RelationalWhere, c as Fields, d as Scalar, f as ScalarField, g as Expression, h as Where, i as RelationalQueryResult, l as Ordered, m as SelectionResult, n as RelationalQueries, o as Adjacent, p as Selection, r as RelationalQueryOptions, s as Field, t as RelationalCountOptions } from "./relational-types-DgK3rLuw.mjs";
+import { a as RelationalWhere, c as Fields, d as Scalar, f as ScalarField, g as Expression, h as Where, i as RelationalQueryResult, l as Ordered, m as SelectionResult, n as RelationalQueries, o as Adjacent, p as Selection, r as RelationalQueryOptions, s as Field, t as RelationalCountOptions } from "./relational-types-B45zM34W.mjs";
 //#region src/query/operators.d.ts
 /** Matches a scalar using strict value/date equality. */
 export declare function eq<Value>(field: ScalarField<Value>, value: NoInfer<Value>): Expression;

package/dist/{relational-types-DgK3rLuw.d.mts → relational-types-B45zM34W.d.mts}

@@ -1,4 +1,4 @@
-import { c as Relationship, i as CollectionRegistry, l as RelationshipsOf, o as PayloadsOf, s as QueryData } from "./types-C-kdMblM.mjs";
+import { c as Relationship, i as CollectionRegistry, l as RelationshipsOf, o as PayloadsOf, s as QueryData } from "./types-BC8gVJ6u.mjs";
 //#region src/query/plan.d.ts
 type PredicateOperator = "eq" | "ne" | "gt" | "gte" | "lt" | "lte" | "in-array" | "not-in-array" | "contains" | "starts-with" | "ends-with" | "like" | "ilike" | "array-contains" | "array-contains-any" | "array-contains-all" | "array-contained" | "is-null" | "is-undefined" | "is-missing";
 type Expression = {

package/dist/runtime.d.mts

@@ -1,3 +1,3 @@
+import { a as ContentDiagnostic, o as ContentError, s as ContentErrorCode, t as Content } from "./content-lwPxE9Yu.mjs";
 import { n as ContentRenderResult, t as ContentHeading } from "./types-Dh-Sydyw.mjs";
-import { a as ContentError, i as ContentDiagnostic, o as ContentErrorCode, t as Content } from "./content-G69dPPuo.mjs";
 export { type Content, type ContentDiagnostic, ContentError, type ContentErrorCode, type ContentHeading, type ContentRenderResult };

package/dist/{types-C-kdMblM.d.mts → types-BC8gVJ6u.d.mts}

@@ -1,4 +1,4 @@
-import { a as Loader } from "./types-ChaNhj42.mjs";
+import { o as Loader } from "./types-FmUJ3cH1.mjs";
 import { n as ContentRenderResult } from "./types-Dh-Sydyw.mjs";
 import { StandardSchemaV1 } from "@standard-schema/spec";
 //#region src/collection/types.d.ts
@@ -57,13 +57,13 @@ type BuiltinPayloads = {
   /** HTML and headings; entries without a rendering path reject with `not-renderable`. */
   _rendered: ContentRenderResult;
 };
-/** Type-only marker recording whether a defined collection carries built-in payloads. */
-type BuiltinPayloadMarker<Available extends boolean> = {
+/** Type-only marker recording which built-in payloads a defined collection carries. */
+type BuiltinPayloadMarker<Available extends keyof BuiltinPayloads> = {
   readonly [builtinPayloadsType]?: Available;
 };
 /** Payload names and value types that queries can request for a collection definition. */
 type PayloadsOf<Definition> = Definition extends {
   readonly [builtinPayloadsType]?: infer Available;
-} ? [Available] extends [false | undefined] ? {} : BuiltinPayloads : BuiltinPayloads;
+} ? Pick<BuiltinPayloads, Available & keyof BuiltinPayloads> : BuiltinPayloads;
 //#endregion
 export { ComputedContext as a, Relationship as c, SchemaOutput as d, CollectionRegistry as i, RelationshipsOf as l, BuiltinPayloads as n, PayloadsOf as o, CollectionDefinition as r, QueryData as s, BuiltinPayloadMarker as t, Schema as u };

package/dist/{types-ChaNhj42.d.mts → types-FmUJ3cH1.d.mts}

@@ -5,6 +5,7 @@ type MaybePromise<Value> = Value | Promise<Value>;
 //#region src/loaders/types.d.ts
 declare const loaderSourceType: unique symbol;
 declare const recordLoaderType: unique symbol;
+declare const bodyLoaderType: unique symbol;
 /** A stored content record, following Astro's build-time DataEntry contract. */
 type DataEntry<Data extends Record<string, unknown> = Record<string, unknown>, Source = unknown> = {
   id: string;
@@ -135,9 +136,17 @@ type RecordLoader<Source = unknown> = Loader<Source> & {
   /** Type-only marker: entries never carry built-in `_body` or `_rendered` payloads. */
   readonly [recordLoaderType]: true;
 };
+/**
+ * A loader whose entries carry raw bodies but never rendered output, such as a loader for a
+ * format that the host application compiles itself.
+ */
+type BodyLoader<Source = unknown> = Loader<Source> & {
+  /** Type-only marker: entries offer the built-in `_body` payload but never `_rendered`. */
+  readonly [bodyLoaderType]: true;
+};
 /** Infers the source metadata a typed loader supplies to computed resolvers. */
 type LoaderSource<Value> = Value extends {
   readonly [loaderSourceType]?: infer Source;
 } ? Source : unknown;
 //#endregion
-export { Loader as a, LoaderLogger as c, MetaStore as d, RecordLoader as f, FileSource as i, LoaderSource as l, DataStore as n, LoaderConfig as o, MaybePromise as p, FileEntrySource as r, LoaderContext as s, DataEntry as t, LoaderWatcher as u };
+export { FileSource as a, LoaderContext as c, LoaderWatcher as d, MetaStore as f, FileEntrySource as i, LoaderLogger as l, MaybePromise as m, DataEntry as n, Loader as o, RecordLoader as p, DataStore as r, LoaderConfig as s, BodyLoader as t, LoaderSource as u };

package/dist/vite.d.mts

@@ -1,6 +1,18 @@
-import { t as BuildContentOptions } from "./build-DfKd2bpf.mjs";
+import { a as ContentSourceEvent, o as ContentSourceSnapshot, t as BuildContentOptions } from "./build-jKnjDjQE.mjs";
 import { Plugin } from "vite";
 //#region src/integrations/vite/plugin.d.ts
+/** Public, format-neutral hooks for integrations sharing this plugin's preparation session. */
+type ContentQueryPluginApi = {
+  /** Prepares or awaits the shared session and returns its current source identities. */
+  prepare(): Promise<ContentSourceSnapshot>;
+  /** Observes subsequent source publications and errors without owning another watcher. */
+  subscribe(listener: (event: ContentSourceEvent) => void): () => void;
+};
+/** A normal Vite plugin with a typed source-integration API. */
+interface ContentQueryPlugin extends Plugin<ContentQueryPluginApi> {
+  api: ContentQueryPluginApi;
+}
 /** Integrates in-memory content with Vite; opt into generated storage for standalone artifacts. */
-export declare function contentQuery(options?: Omit<BuildContentOptions, "watch">): Plugin;
-//#endregion
+export declare function contentQuery(options?: Omit<BuildContentOptions, "watch">): ContentQueryPlugin;
+//#endregion
+export type { ContentQueryPlugin, ContentQueryPluginApi };

package/dist/vite.mjs

@@ -1,4 +1,4 @@
-import { a as sessionInternals, i as resolveConfigPath, l as virtualDeclarations, o as withinDirectory, r as configCandidates, s as writeChanged, t as buildAtRoot, u as revisionModules } from "./build-Dxz7P1ur.mjs";
+import { a as sessionInternals, i as resolveConfigPath, l as virtualDeclarations, o as withinDirectory, r as configCandidates, s as writeChanged, t as buildAtRoot, u as revisionModules } from "./build-CI4s0oFP.mjs";
 import { n as serializeContentError } from "./diagnostics-Cu94mZhl.mjs";
 import { createRequire } from "node:module";
 import path from "node:path";
@@ -122,6 +122,7 @@ function contentQuery(options = {}) {
 	let encoding;
 	const bridgeKey = randomUUID();
 	const refreshClients = /* @__PURE__ */ new WeakSet();
+	const sourceListeners = /* @__PURE__ */ new Set();
 	/** Publishes type-only facade binding without importing configuration in executable code. */
 	async function writeTypes(configPath) {
 		const directory = path.join(config.root, ".content-query");
@@ -216,6 +217,14 @@ function contentQuery(options = {}) {
 				if (config.command === "serve") changed(state).catch(deliveryFailed);
 			});
 			session = prepared;
+			prepared.subscribe((event) => {
+				const listeners = [...sourceListeners];
+				for (const listener of listeners) try {
+					listener(event);
+				} catch (cause) {
+					config.logger.error(`Content source subscriber failed: ${cause instanceof Error ? cause.message : String(cause)}`);
+				}
+			});
 			try {
 				if (config.command === "serve") {
 					const global = globalThis;
@@ -235,6 +244,19 @@ function contentQuery(options = {}) {
 	}
 	return {
 		name: "content-query",
+		api: {
+			async prepare() {
+				const prepared = await ensureSession();
+				await sessionInternals(prepared).idle();
+				return prepared.sources();
+			},
+			subscribe(listener) {
+				sourceListeners.add(listener);
+				return () => {
+					sourceListeners.delete(listener);
+				};
+			}
+		},
 		enforce: "pre",
 		configResolved(resolved) {
 			config = resolved;
@@ -288,6 +310,7 @@ function contentQuery(options = {}) {
 			server = void 0;
 			await starting?.catch(() => void 0);
 			await session?.dispose();
+			sourceListeners.clear();
 			globalThis[bridgeSymbol]?.delete(bridgeKey);
 		}
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "content-query",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Typed, framework-independent content collections, queries, and rendering.",
   "homepage": "https://github.com/yangshun/content-query#readme",
   "bugs": {
@@ -71,7 +71,7 @@
     "vite-plus": "1.3.0"
   },
   "peerDependencies": {
-    "next": "^16.0.0",
+    "next": "^15.0.0 || ^16.0.0",
     "vite": "^8.0.0"
   },
   "peerDependenciesMeta": {

package/dist/build-DfKd2bpf.d.mts

@@ -1,25 +0,0 @@
-import { i as CollectionRegistry } from "./types-C-kdMblM.mjs";
-import { s as InvalidRelationships, t as Content } from "./content-G69dPPuo.mjs";
-//#region src/preparation/session.d.ts
-type ContentSession<Registry extends CollectionRegistry = {}> = {
-  content: Content<Registry>;
-  dispose(): Promise<void>;
-};
-//#endregion
-//#region src/preparation/build.d.ts
-/** Options shared by standalone content builds and host integrations. */
-type BuildContentOptions = {
-  /** Exact config path; omission discovers one content-query.config.{ts,mts,cts,js,mjs,cjs} file. */
-  config?: string;
-  backend?: "in-memory" | "generated";
-  /** Generated backend output directory, relative to the application root; defaults to ./.content-query. */
-  outDir?: string;
-  watch?: boolean;
-};
-/**
- * Builds content independently of a bundler; bind the registry through an erased type import.
- * Generated watch sessions prune previous-run artifacts after their first successful publication.
- */
-declare function buildContent<Registry extends CollectionRegistry = {}>(...arguments_: InvalidRelationships<Registry> extends never ? [options?: BuildContentOptions] : [invalidRegistry: never]): Promise<ContentSession<Registry>>;
-//#endregion
-export { buildContent as n, ContentSession as r, BuildContentOptions as t };