@uniweb/build 0.56.0 → 0.57.0

package/src/site/plugin.js

@@ -50,7 +50,7 @@ import { collectSiteContent, mountEntriesOf } from './content-collector.js'
 import { processAssets, rewriteSiteContentPaths } from './asset-processor.js'
 import { processAdvancedAssets } from './advanced-processors.js'
 import { processQueries, writeQueryFiles } from './query-processor.js'
-import { ENTITIES_DIR } from './entity-pool.js'
+import { RECORDS_DIR, resolveRecordsDir } from './entity-pool.js'
 import { executeFetch, mergeDataIntoContent, toFetchList } from './data-fetcher.js'
 import { shouldSplitContent } from './split-content.js'
 import { FONT_LINKS_MARKER } from './head-markers.js'
@@ -133,7 +133,7 @@ export function shouldPrefetchInDev(cfg) {
  *     query list just collected, reload. `queries.yml` declares queries, and so does
  *     `site.yml` (`queries:`), beside the rest of the site's configuration.
  *   - `'records'` — re-materialize the query files, reload: `records.yml` decides
- *     which entities are records, as an entity change decides what one says.
+ *     which folder each record sits in, which a query's `scope:` reads.
  *   - `'content'` — re-collect the site, reload.
  *
  * ⛔ Until 2026-09-14 nothing watched `records.yml` or `queries.yml`, a `site.yml`
@@ -665,7 +665,7 @@ export function siteContentPlugin(options = {}) {
   let resolvedPagesPath = null // Resolved from site.yml pagesDir or default
   let resolvedMountPaths = [] // Absolute dirs mounted under pages/ via site.yml paths:
   let resolvedLayoutPath = null // Resolved from site.yml layoutDir or default
-  let resolvedEntitiesDir = null // site.yml `paths.entities`, site-root-relative
+  let resolvedRecordsDir = null // site.yml `paths.records` as written, via `resolveRecordsDir`
   let headHtml = '' // Contents of site/head.html for injection
   let basePath = '/' // Vite's config.base, always has trailing slash
 
@@ -725,8 +725,11 @@ export function siteContentPlugin(options = {}) {
    */
   async function materializeQueries(queries, config) {
     if (!queries) return
-    const byQuery = await processQueries(resolvedSitePath, queries, resolvedEntitiesDir, basePath, {
+    const byQuery = await processQueries(resolvedSitePath, queries, resolvedRecordsDir, basePath, {
       locale: resolveDefaultLocale(config ?? {}) ?? null,
+      // ⭐ A draft is previewable here, as a hidden page is — `pnpm dev` is where the
+      // author looks at it. A production build leaves it out (`buildStart`).
+      includeDrafts: !isProduction,
     })
     await writeQueryFiles(resolvedSitePath, byQuery, queries)
   }
@@ -911,7 +914,7 @@ export function siteContentPlugin(options = {}) {
           resolvedLayoutPath = paths.layout
             ? resolve(resolvedSitePath, paths.layout)
             : resolve(resolvedSitePath, 'layout')
-          resolvedEntitiesDir = paths.entities || null
+          resolvedRecordsDir = resolveRecordsDir(resolvedSitePath, paths).rel
           resolvedMountPaths = mountEntriesOf(paths).map(([, rel]) => resolve(resolvedSitePath, rel))
 
           if (queriesConfig) {
@@ -934,7 +937,7 @@ export function siteContentPlugin(options = {}) {
         resolvedLayoutPath = paths.layout
           ? resolve(resolvedSitePath, paths.layout)
           : resolve(resolvedSitePath, 'layout')
-        resolvedEntitiesDir = paths.entities || null
+        resolvedRecordsDir = resolveRecordsDir(resolvedSitePath, paths).rel
       }
     },
 
@@ -954,7 +957,7 @@ export function siteContentPlugin(options = {}) {
         // In production, do it here
         if (isProduction && siteContent.config?.queries) {
           console.log('[site-content] Materializing queries...')
-          const byQuery = await processQueries(resolvedSitePath, siteContent.config.queries, resolvedEntitiesDir, basePath)
+          const byQuery = await processQueries(resolvedSitePath, siteContent.config.queries, resolvedRecordsDir, basePath)
           await writeQueryFiles(resolvedSitePath, byQuery, siteContent.config.queries)
         }
 
@@ -1113,11 +1116,11 @@ export function siteContentPlugin(options = {}) {
         // ⭐ WATCH THE POOL, NOT A DIRECTORY PER QUERY. This used to resolve
         // `config.path` for each declaration and watch each one, so a schema
         // folder no query had mentioned yet — a new one, mid-session — was
-        // watched by nothing and its records never rebuilt. `entities/` is one
+        // watched by nothing and its records never rebuilt. `records/` is one
         // recursive root and covers every schema, present and future.
         {
           const contentPaths = new Set([
-            resolve(resolvedSitePath, resolvedEntitiesDir || ENTITIES_DIR)
+            resolve(resolvedSitePath, resolvedRecordsDir || RECORDS_DIR)
           ])
 
           for (const contentPath of contentPaths) {

package/src/site/queries-config.js

@@ -16,9 +16,9 @@
 // rather keep one file. Precedence (per-query, per-key): queries.yml > site.yml.
 //
 // ⛔ THE THREE JOBS `collections/<name>/` USED TO FUSE ARE NOW THREE THINGS.
-// `entities/{schema}/` is the pool, `records.yml` is the folder (what makes an
-// entity a record), and a query asks the folder for a set. This file resolves the
-// LAST of those only.
+// `records/{schema}/` holds the site's records (placing a file there is what makes
+// it one), `records.yml` sorts them into folders, and a query asks for a set. This
+// file resolves the LAST of those only.
 //
 // ⚠️ `collections.yml` and `site.yml::collections` are GONE, with no alias and no
 // deprecation path — the model's §5 ruling, and there is nothing outside this
@@ -85,7 +85,7 @@ export function defaultSchema(name) {
 // address nothing local can derive.
 function normalizeQueryDecl(name, decl) {
   // ⭐ THE STRING SHORTHAND NAMES THE SCHEMA, because that is what a file-based
-  // query actually needs — `entities/{schema}/` supplies the records, so there is
+  // query actually needs — `records/{schema}/` supplies the records, so there is
   // no directory left to name. (It named a PATH while the pool was
   // `collections/<name>/` and the same directory answered both questions.)
   if (typeof decl === 'string') return { name, schema: decl }
@@ -165,7 +165,7 @@ export async function resolveQueriesConfig(siteRoot, opts = {}) {
     if (decl.path && decl.url === undefined) {
       console.warn(
         `[uniweb] query "${decl.name}": \`path: ${decl.path}\` is ignored. A query names a ` +
-          `\`schema:\` and \`entities/{schema}/\` supplies its records — there is no directory ` +
+          `\`schema:\` and \`records/{schema}/\` supplies its records — there is no directory ` +
           `for it to name. Move the files under the schema folder instead.`
       )
     }
@@ -234,6 +234,16 @@ export function refuseQueryDeclaration(decl) {
   }
   refuseQueryRoute(decl, where)
   refuseLimit(decl.limit, where)
+  // ⛔ `sync:` IS RETIRED (2026-09-21). `sync: false` kept a query's records off a
+  // backend while a query owned its records; every record in `records/` is pushed
+  // now, whatever reads it, so an ignored `sync: false` would push exactly what the
+  // author meant to hold back. Refused, naming what does that now.
+  if (decl.sync !== undefined) {
+    throw new Error(
+      `[uniweb] ${where}: \`sync:\` is retired — a query does not own its records. Every file in ` +
+        `\`records/\` is a record and is pushed; a file whose name starts with \`_\` is not a record.`
+    )
+  }
   const external = decl.url !== undefined
   if (!external) {
     for (const key of ['method', 'body', 'transform', 'record']) {