@uniweb/unipress 0.8.20 → 0.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/unipress",
-  "version": "0.8.20",
+  "version": "0.9.0",
   "description": "Compile a content directory into a document (PDF, EPUB, Paged.js HTML, Typst source bundle, DOCX, XLSX) using a Uniweb foundation. Five built-in templates: book, monograph, report, data-report, directory.",
   "type": "module",
   "publishConfig": {
@@ -50,10 +50,10 @@
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "@uniweb/build": "^0.33.0",
-    "@uniweb/content-reader": "^1.2.4",
     "@uniweb/runtime": "^0.13.5",
-    "@uniweb/core": "^0.16.0",
-    "@uniweb/semantic-parser": "^1.4.0"
+    "@uniweb/semantic-parser": "^1.4.0",
+    "@uniweb/content-reader": "^1.2.4",
+    "@uniweb/core": "^0.16.0"
   },
   "devDependencies": {
     "vitest": "^4.1.7"

package/src/content-loader.js

@@ -10,7 +10,7 @@
 
 import { existsSync, readdirSync } from 'node:fs'
 import { resolve, join, basename } from 'node:path'
-import { collectSiteContent, processCollections } from '@uniweb/build/content'
+import { collectSiteContent, processQueries } from '@uniweb/build/content'
 import { detectConfigFile, CONFIG_FILE_NAMES } from './document-yml.js'
 import { ContentDirectoryError, DocumentYmlError } from './errors.js'
 
@@ -32,7 +32,7 @@ function attachData(section, schema, data) {
   }
 }
 
-function findCollectionRecords(fetchConfig, resolved) {
+function findQueryRecords(fetchConfig, resolved) {
   if (!fetchConfig?.path || !fetchConfig?.schema) return null
   const m = COLLECTION_PATH_RE.exec(fetchConfig.path)
   if (!m) return null
@@ -51,7 +51,7 @@ function findCollectionRecords(fetchConfig, resolved) {
 function attachSectionFetches(sections, resolved, cascade = null) {
   if (!Array.isArray(sections)) return
   for (const section of sections) {
-    const records = findCollectionRecords(section.fetch, resolved)
+    const records = findQueryRecords(section.fetch, resolved)
     if (records) attachData(section, section.fetch.schema, records)
     if (cascade) attachData(section, cascade.schema, cascade.records)
     if (Array.isArray(section.subsections) && section.subsections.length) {
@@ -65,7 +65,7 @@ function attachSectionFetches(sections, resolved, cascade = null) {
  * `parsedContent.data` so the SSR render pipeline reads populated data
  * synchronously (no `useFetched` round-trip; no `public/` directory).
  *
- * In a regular Uniweb site build, the Vite plugin runs `processCollections`
+ * In a regular Uniweb site build, the Vite plugin runs `processQueries`
  * + `writeCollectionFiles` and the runtime resolves `fetch:` declarations
  * over HTTP at render time. Under `unipress compile` neither of those
  * happens — there's no public dir, and SSR skips effects. We close the
@@ -81,15 +81,36 @@ function attachSectionFetches(sections, resolved, cascade = null) {
  * fetches, refine configs, and array-form `fetch: [...]` declarations
  * are left untouched (those have their own gaps; out of scope here).
  */
-async function resolveLocalCollections(siteContent, sitePath) {
-  const collectionsConfig = siteContent?.config?.collections
-  if (!collectionsConfig || typeof collectionsConfig !== 'object') return
-  if (Object.keys(collectionsConfig).length === 0) return
-
-  const resolved = await processCollections(
-    sitePath,
-    collectionsConfig,
+async function resolveLocalQueries(siteContent, sitePath) {
+  // ⛔ **`config.queries`, not `config.collections`.** The build renamed both the
+  // payload key and the function on 2026-08-29 (`@uniweb/build` e442738, "no
+  // identifier in build says `collection` any more") and this file was not
+  // carried across — the same shape that left `hosting` reading a key nothing
+  // emits, noted in `framework/CLAUDE.md` § *Decoupling is the architecture*.
+  //
+  // ⚠️ **The crash was the lucky half.** `processCollections` being undefined
+  // only threw because our own fixture still declared the retired
+  // `site.yml::collections`, which is passed through verbatim as an unrecognised
+  // key. A CURRENT site declares `queries:`, so this read returned undefined,
+  // the guard below returned early, and unipress compiled documents with **no
+  // query data and no error** — silent, which is why four days passed.
+  //
+  // Local identifiers keep the older word deliberately: `framework/CLAUDE.md`
+  // says renaming those is churn. Only the two names that cross a package
+  // boundary had to move.
+  const queriesConfig = siteContent?.config?.queries
+  if (!queriesConfig || typeof queriesConfig !== 'object') return
+  if (Object.keys(queriesConfig).length === 0) return
+
+  // ⛔ Third arg is the ENTITIES POOL override, not the site root. Passing
+  // `sitePath` made the pool resolve to `<site>/{schema}/` instead of
+  // `<site>/entities/{schema}/`, so every query matched nothing. `null` takes
+  // the default, which is what a site without `paths.entities` wants — the
+  // same value `@uniweb/build`'s own plugin computes (`paths.entities || null`).
+  const resolved = await processQueries(
     sitePath,
+    queriesConfig,
+    siteContent?.config?.paths?.entities || null,
     '/',
   )
 
@@ -97,7 +118,7 @@ async function resolveLocalCollections(siteContent, sitePath) {
     // Page-level fetch cascades to every section on the page — top-level
     // and nested alike. attachSectionFetches threads it through the whole
     // section tree; a section's own fetch still takes priority.
-    const pageRecords = findCollectionRecords(page.fetch, resolved)
+    const pageRecords = findQueryRecords(page.fetch, resolved)
     const cascade = pageRecords
       ? { schema: page.fetch.schema, records: pageRecords }
       : null
@@ -108,16 +129,29 @@ async function resolveLocalCollections(siteContent, sitePath) {
   // (regardless of its own page's fetch declaration) can self-bootstrap
   // — e.g., a Cite inset rendering inside a Chapter on page A needs the
   // bibliography records that the Bibliography section declared on page
-  // B. Foundations read this via `block.website.config.collections.<name>.records`
+  // B. Foundations read this via `block.website.config.recordsByQuery.<name>`
   // as a synchronous fallback.
+  //
+  // ⭐ **`recordsByQuery`, because "collections" named nothing.** This key is
+  // unipress's own — written here, read only by unipress foundations, never
+  // emitted or read by `@uniweb/build`. It was called `collections`, which
+  // collided with the build's payload key of the same name and said nothing
+  // about what it held. *[Diego, 2026-09-02]* — "collect" as an act is fine;
+  // as a set of things it is useless, because it gives no sense of what KIND of
+  // things, where `records`, `queries` and `entities` each carry meaning.
+  //
+  // This holds **records, keyed by the query that resolved them**, and the name
+  // now says exactly that. ⚠️ Not `config.records`, which the framework already
+  // uses for live record URL patterns (`core/src/query-address.js`).
+  //
+  // The value is the record ARRAY directly, not `{ records: [...] }`. The
+  // wrapper existed to merge with a pre-existing `config.collections` from the
+  // build — which cannot happen now that the build emits `queries` — and
+  // `recordsByQuery.<name>.records` would have said "records" twice.
   if (!siteContent.config) siteContent.config = {}
-  if (!siteContent.config.collections) siteContent.config.collections = {}
+  if (!siteContent.config.recordsByQuery) siteContent.config.recordsByQuery = {}
   for (const name of Object.keys(resolved)) {
-    const existing = siteContent.config.collections[name]
-    siteContent.config.collections[name] = {
-      ...(existing && typeof existing === 'object' ? existing : {}),
-      records: resolved[name],
-    }
+    siteContent.config.recordsByQuery[name] = resolved[name]
   }
 }
 
@@ -196,7 +230,7 @@ export async function loadContent(dir, options = {}) {
     throw err
   }
 
-  await resolveLocalCollections(content, sitePath)
+  await resolveLocalQueries(content, sitePath)
 
   // Cross-reference registry is built AFTER the foundation loads, in
   // orchestrator.loadAndInit, so foundation-declared `xref.kinds`