@uniweb/build 1.8.1 → 1.8.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "description": "Build tooling for the Uniweb Component Web Platform",
   "type": "module",
   "exports": {
@@ -56,15 +56,15 @@
     "js-yaml": "^4.1.0",
     "sharp": "^0.35.3",
     "yaml": "^2.5.0",
-    "@uniweb/schemas": "~1.6.5",
-    "@uniweb/semantic-parser": "~1.12.2",
-    "@uniweb/projections": "~1.1.6",
+    "@uniweb/content-reader": "~1.5.5",
+    "@uniweb/projections": "~1.1.7",
     "@uniweb/content-writer": "~1.3.0",
-    "@uniweb/content-reader": "~1.5.4",
+    "@uniweb/schemas": "~1.6.5",
+    "@uniweb/semantic-parser": "~1.13.0",
     "@uniweb/theming": "~1.2.1"
   },
   "optionalDependencies": {
-    "@uniweb/runtime": "~1.1.15"
+    "@uniweb/runtime": "~1.1.18"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",
@@ -73,8 +73,8 @@
     "@tailwindcss/vite": "^4.0.0",
     "@vitejs/plugin-react": "^4.0.0 || ^5.0.0",
     "vite-plugin-svgr": "^4.0.0",
-    "@uniweb/core": "~1.4.0",
-    "@uniweb/runtime": "~1.1.15"
+    "@uniweb/core": "~1.4.3",
+    "@uniweb/runtime": "~1.1.18"
   },
   "peerDependenciesMeta": {
     "vite": {

package/src/i18n/records.js

@@ -1011,11 +1011,12 @@ export async function buildLocalizedRecords(siteRoot, options = {}) {
         }
 
         // ⭐ AND THE QUERY'S PER-RECORD FILES, beside the translated list and with the
-        // same translations — `/<locale>/data/<query>/<slug>.json`. A query with
-        // `deferred:` fields writes each record whole there, and a parametric page reads
-        // its record from that file. ⛔ Until 2026-09-14 they were not written for any
-        // locale, so a localized site's records showed their deferred fields — an
-        // article's body — in the source language under a translated list.
+        // same translations — `/<locale>/data/<query>/<$name>.json`. Every query writes each
+        // record whole there (2026-09-27), and a parametric page reads its record from that
+        // file. ⛔ Until 2026-09-14 they were not written for any locale, so a localized
+        // site's records showed their whole fields — an article's body — in the source
+        // language under a translated list. ⛔ *This said only a `deferred:` query had them
+        // until 2026-10-24; `deferred:` was removed on 2026-09-27.*
         // They are translated first: a lean list's derived excerpt is derived from its record's
         // translated body (`EXCERPT`).
         const localeRecordsDir = join(localeDataDir, queryName)

package/src/prerender.js

@@ -28,6 +28,7 @@ import DataStore from '@uniweb/core/datastore'
 import { executeFetch, mergeDataIntoContent, toFetchList } from './site/data-fetcher.js'
 import { createFileTransport } from './site/file-transport.js'
 import { shouldSplitContent } from './site/split-content.js'
+import { jsonForScript, splitPageSections } from '@uniweb/core/data-script'
 import { FONT_LINKS_MARKER } from './site/head-markers.js'
 import { getAdapter } from './hosts/index.js'
 import { detectCiContext } from './hosts/detect-ci-context.js'
@@ -724,18 +725,10 @@ export function injectBuildData(html, siteContent, { splitContent = false, curre
     delete contentForJson.theme.links
   }
 
-  // Split mode: strip sections from all pages except the current one.
-  // Dynamic templates (isDynamic) keep their sections — needed by _createDynamicPage().
+  // Split mode: sections for the current page and every dynamic template only — the rule a host
+  // writes its `__DATA__` by too (`@uniweb/core/data-script`). Every other page's are in `_pages/`.
   if (splitContent) {
-    contentForJson = {
-      ...contentForJson,
-      pages: contentForJson.pages.map(page => {
-        if (page.route === currentRoute) return page
-        if (page.isDynamic) return page
-        const { sections, ...metadata } = page
-        return metadata
-      })
-    }
+    contentForJson = { ...contentForJson, pages: splitPageSections(contentForJson.pages, currentRoute) }
   }
 
   // Scope fetched (collection / API) data to this page's cascade in split mode,
@@ -748,7 +741,7 @@ export function injectBuildData(html, siteContent, { splitContent = false, curre
     }
   }
 
-  const contentScript = `<script id="__SITE_CONTENT__" type="application/json">${JSON.stringify(contentForJson).replace(/</g, '\\u003c')}</script>`
+  const contentScript = `<script id="__SITE_CONTENT__" type="application/json">${jsonForScript(contentForJson)}</script>`
   if (result.includes('__SITE_CONTENT__')) {
     // Replace existing site content with updated version (includes expanded dynamic routes)
     result = result.replace(
@@ -764,7 +757,7 @@ export function injectBuildData(html, siteContent, { splitContent = false, curre
 
   // Inject icon cache so client can render icons immediately without CDN fetches
   if (siteContent._iconCache) {
-    const iconScript = `<script id="__ICON_CACHE__" type="application/json">${JSON.stringify(siteContent._iconCache).replace(/</g, '\\u003c')}</script>`
+    const iconScript = `<script id="__ICON_CACHE__" type="application/json">${jsonForScript(siteContent._iconCache)}</script>`
     if (result.includes('__ICON_CACHE__')) {
       result = result.replace(
         /<script[^>]*id="__ICON_CACHE__"[^>]*>[\s\S]*?<\/script>/,

package/src/site/content-collector.js

@@ -241,6 +241,22 @@ function detectVersions(folderNames) {
   return versions
 }
 
+/**
+ * An id an author wrote — a page's `id:` in `page.yml`, a section's in its frontmatter — as the
+ * string it names. YAML reads `id: 404` as a number, and an id is never one: a `page:404` link
+ * names the string, and a store holds a stable id as text.
+ *
+ * ⛔ *Until 2026-10-24 the parsed value was kept, so a page with `id: 404` matched no `page:`
+ * link, and a push sent its stable id as a number, which a backend refuses (measured that day:
+ * HTTP 400, "item.data.stable_id must be a string").*
+ *
+ * @param {*} value
+ * @returns {string|null} null for an id not written, or written empty
+ */
+export function authoredId(value) {
+  return value === undefined || value === null || value === '' ? null : String(value)
+}
+
 /**
  * `query:` — the shorthand for `fetch: { query }`, at every level that declares
  * data: a section's frontmatter, `page.yml`, `folder.yml` and `site.yml`, on the
@@ -1168,7 +1184,7 @@ async function processMarkdownFile(filePath, id, siteRoot, defaultStableId = nul
 
   // Stable ID for scroll targeting: frontmatter id > filename-derived > null
   // This ID is stable across reordering (unlike the positional id)
-  const stableId = frontmatterId || defaultStableId || null
+  const stableId = authoredId(frontmatterId) || defaultStableId || null
 
   const section = {
     id,
@@ -1434,7 +1450,7 @@ async function processPage(pagePath, pageName, siteRoot, { isIndex = false, pare
       page: {
         route,
         sourcePath: parentRoute === '/' ? `/${pageName}` : `${parentRoute}/${pageName}`,
-        id: pageConfig.id || null,
+        id: authoredId(pageConfig.id),
         isIndex,
         title: resolveDisplayTitle(pageConfig.title, pageName, null),
         description: pageConfig.description || '',
@@ -1460,7 +1476,7 @@ async function processPage(pagePath, pageName, siteRoot, { isIndex = false, pare
       page: {
         route,
         sourcePath: parentRoute === '/' ? `/${pageName}` : `${parentRoute}/${pageName}`,
-        id: pageConfig.id || null,
+        id: authoredId(pageConfig.id),
         isIndex,
         title: resolveDisplayTitle(pageConfig.title, pageName, null),
         description: pageConfig.description || '',
@@ -1731,7 +1747,7 @@ async function processPage(pagePath, pageName, siteRoot, { isIndex = false, pare
     page: {
       route,
       sourcePath, // Original folder-based path (for ancestor checking in navigation)
-      id: pageConfig.id || null, // Stable page ID for page: links (survives reorganization)
+      id: authoredId(pageConfig.id), // Stable page ID for page: links (survives reorganization)
       isIndex, // Marks this page as the index for its parent route
       title: resolveDisplayTitle(pageConfig.title, pageName, hierarchicalSections),
       description: pageConfig.description || '',

package/src/site/index.js

@@ -12,9 +12,10 @@ export { defineSiteConfig, readSiteConfig, default } from './config.js'
 export { PREVIEW_ENV, encodePreview, readPreview } from './preview.js'
 export { collectSiteContent } from './content-collector.js'
 // The `agents:` vocabulary lives in @uniweb/projections (which owns the block);
-// re-exported so the CLI can validate an author's spelling without taking a
-// direct dependency on it. Same shape as the search re-exports.
-export { AGENTS_KEYS } from '@uniweb/projections'
+// re-exported so the CLI can validate an author's spelling, and read an
+// `expectedOrigins` entry by its rule, without taking a direct dependency on it.
+// Same shape as the search re-exports.
+export { AGENTS_KEYS, originOf } from '@uniweb/projections'
 export { buildSiteData } from './build-site-data.js'
 export { shouldSplitContent } from './split-content.js'
 export {

package/src/site/plugin.js

@@ -53,6 +53,9 @@ import { processQueries, writeQueryFiles } from './query-processor.js'
 import { RECORDS_DIR, resolveRecordsDir } from './entity-pool.js'
 import { executeFetch, mergeDataIntoContent, toFetchList } from './data-fetcher.js'
 import { shouldSplitContent } from './split-content.js'
+import { jsonForScript } from '@uniweb/core/data-script'
+// A favicon's MIME type by its extension — the rule a host's page shell types it by too.
+import { faviconType } from '@uniweb/core/page-shell'
 import { FONT_LINKS_MARKER } from './head-markers.js'
 import { collectExtensionAssets, isBrowserAsset } from './emit-extensions.js'
 import { extensionNameOf, findSiteExtension } from './workspace-extension.js'
@@ -86,14 +89,6 @@ function extensionContentType(file) {
   return EXTENSION_CONTENT_TYPES[file.split('.').pop()?.toLowerCase()] || 'application/octet-stream'
 }
 
-function faviconTypeFor(href) {
-  const ext = href.split('?')[0].split('.').pop()?.toLowerCase()
-  if (ext === 'svg') return 'image/svg+xml'
-  if (ext === 'ico') return 'image/x-icon'
-  if (ext === 'png') return 'image/png'
-  return null
-}
-
 /**
  * Resolve a favicon href for index.html injection.
  *  - If config.favicon is a string, use it as-is.
@@ -1572,14 +1567,14 @@ export function siteContentPlugin(options = {}) {
       // Source 2: auto-detect public/favicon.{ico,svg,png}
       const faviconHref = resolveFaviconHref(contentToInject?.config?.favicon, resolvedPublicDir, basePath)
       if (faviconHref) {
-        const type = faviconTypeFor(faviconHref)
+        const type = faviconType(faviconHref)
         const typeAttr = type ? ` type="${type}"` : ''
         headInjection += `    <link rel="icon"${typeAttr} href="${faviconHref}">\n`
       }
 
       // Inject content as JSON script tag
       if (inject) {
-        headInjection += `    <script type="application/json" id="${variableName}">${JSON.stringify(contentToInject).replace(/</g, '\\u003c')}</script>\n`
+        headInjection += `    <script type="application/json" id="${variableName}">${jsonForScript(contentToInject)}</script>\n`
       }
 
       let result = html

package/src/site/queries-config.js

@@ -36,7 +36,8 @@ import { detectFoundationType, parseCatalogRef } from './foundation-ref.js'
 import { readRegisteredFoundation } from './registered-foundation.js'
 import { buildDataSchemaMap, SCHEMA_NOT_FOUND } from '../resolve-data-schema.js'
 import { resolveFoundationSrcPath } from '../utils/foundation-source-root.js'
-import { buildSchema } from '../schema.js'
+import { buildSchema, loadFoundationConfig } from '../schema.js'
+import { defaultSectionType } from '@uniweb/core/section-type'
 import { refuseQueryRoute, refuseLimit, refuseFilter } from './data-fetcher.js'
 import { readFile } from 'node:fs/promises'
 import yaml from 'js-yaml'
@@ -466,6 +467,30 @@ export async function foundationSections(siteRoot, siteYml = null) {
   return foundationSchemaJson(siteRoot, yml)
 }
 
+/**
+ * The type a section that names none renders with on this site — its foundation's
+ * `defaultSection`, else `Section` (`@uniweb/core/section-type`, the rule the site's render
+ * asks). A push fills it into such a section, since a store requires a type, and a pull leaves it
+ * out of the section's file again. Read like `foundationSections`: from the foundation's source
+ * when it is local, else from its built or registered `schema.json`, else `Section`.
+ *
+ * @param {string} siteRoot
+ * @param {object} [siteYml] - an already-read site.yml
+ * @returns {Promise<string>}
+ */
+export async function siteDefaultSectionType(siteRoot, siteYml = null) {
+  const yml = siteYml || (await readYamlFile(join(siteRoot, 'site.yml')))
+  const srcDir = localFoundationSrcDir(siteRoot, yml)
+  if (srcDir) {
+    try {
+      return defaultSectionType(await loadFoundationConfig(srcDir))
+    } catch {
+      // a foundation whose source does not read is reported by the build that builds it
+    }
+  }
+  return defaultSectionType(foundationSchemaJson(siteRoot, yml)?._self)
+}
+
 /** The data schemas a site's foundation declares, or null when unresolvable. */
 export function foundationDataSchemas(siteRoot, siteYml) {
   return foundationSchemaJson(siteRoot, siteYml)?.dataSchemas || null

package/src/uwx/index.js

@@ -83,6 +83,9 @@ export { matchStoredRecords } from './record-identity.js'
 export { siteSelfScope } from './self-scope.js'
 // What each section type declares its data blocks are — a pull reads a translated block back by it.
 export { dataBlockModels } from '../i18n/data-models.js'
+// The type a section that names none renders with — a push fills it in, and a pull, handed it up
+// front like the scope above, leaves it out of the section's file.
+export { siteDefaultSectionType } from '../site/queries-config.js'
 export {
   siteInfoToConfig,
   sectionRecordToFile,

package/src/uwx/site-project.js

@@ -44,7 +44,8 @@ import yaml from 'js-yaml'
 import { YAML_OPTIONS } from '../utils/yaml-schema.js'
 import { writeSiteConfig, writeThemeFile, writeIfChanged, writeSectionFile, writeMergedYaml } from './project-writer.js'
 import { declarationsToQueriesYml } from './records-project.js'
-import { FILLED_SECTION_TYPE, buildRouteOf } from './site.js'
+import { buildRouteOf } from './site.js'
+import { DEFAULT_SECTION_TYPE } from '@uniweb/core/section-type'
 import { translationContext, SITE_META_CONTEXT } from '../i18n/extract.js'
 import { authorableDeclaration, DECLARATION_KEYS } from '../site/fetch-shapes.js'
 import { createTranslationCollector, writeLocaleTranslations, writeFreeformTranslations, unwrapLocalizedContent, isProseMirrorDoc } from './locale-sync.js'
@@ -381,9 +382,11 @@ export function siteInfoToConfig({ document, siteRoot, backend = null, sourceLoc
  *        field to (its source doc → the `.md` body)
  * @param {object} [params.collector] - translation collector; target-locale
  *        structural maps on a localized `content` field are captured into it
+ * @param {string} [params.impliedType] - the type a section that names none renders with on this
+ *        site (`siteDefaultSectionType`), which a file leaves out
  * @returns {'updated'|'unchanged'}
  */
-export function sectionRecordToFile({ filePath, record, sourceLocale = LOCALIZED_FIELD_ASSUMPTION.defaultSourceLocale, collector, freeformRelPath, freeformCandidates = null, writeId = true, context = null, dataModel = null }) {
+export function sectionRecordToFile({ filePath, record, sourceLocale = LOCALIZED_FIELD_ASSUMPTION.defaultSourceLocale, collector, freeformRelPath, freeformCandidates = null, writeId = true, context = null, dataModel = null, impliedType = DEFAULT_SECTION_TYPE }) {
   // ⛔ A stored `preset` or `input` is not written back: neither has an effect, and the build
   // would only warn about it (2026-09-27).
   // ⛔ No `background` / `theme_override` / `insets` / `fetch`: the site-content Model dropped all
@@ -416,14 +419,15 @@ export function sectionRecordToFile({ filePath, record, sourceLocale = LOCALIZED
   // for names alone (`authorableDeclaration`, the inverse of the build's resolution), and
   // removed from the file of a section that declares none. ⛔ Until 2026-10-16 a file's own
   // declaration was kept over the backend's, and the next edit to the section pushed it back.
-  // ⛔ Not `type: Content` into a file that names no type: it is what the push sent for it, and
-  // absent, the foundation's `defaultSection` renders it. Until 2026-09-26 a pull wrote it back.
+  // ⛔ Not the implied type into a file that names no type: it is what the push sent for it, and
+  // absent, the same type renders it (`siteDefaultSectionType`). Until 2026-09-26 a pull wrote it
+  // back; until 2026-10-23 the type was `Content`, which the push sent and no foundation rendered.
   return writeSectionFile({
     filePath,
     content: sourceContent,
     params: frontmatter,
     declaration: paramFetch ?? null,
-    implied: { type: FILLED_SECTION_TYPE },
+    implied: { type: impliedType },
   })
 }
 
@@ -542,6 +546,7 @@ export function pageSectionsToFiles({ pageDir, pageSections, ctx, pageContext })
         sourceLocale: ctx?.sourceLocale,
         collector: ctx?.collector,
         dataModel: ctx?.dataModel,
+        impliedType: ctx?.sectionType,
         freeformRelPath,
         freeformCandidates,
         writeId: fileSectionName(filePath) !== stableId,
@@ -1242,6 +1247,7 @@ function projectLayout(layoutSections, layoutBaseDir, report, prune, ctx) {
       sourceLocale: ctx?.sourceLocale,
       collector: ctx?.collector,
       dataModel: ctx?.dataModel,
+      impliedType: ctx?.sectionType,
       writeId: fileSectionName(filePath) !== stableId,
       freeformRelPath: stableId ? buildFreeformPath({ stableId }, page) : null,
       freeformCandidates: stableId ? freeformPathsFor({ stableId }, page) : null,
@@ -1329,9 +1335,12 @@ function refuseContentFilesCannotHold(document, sourceLocale) {
  * @param {string|null} [params.scope] - the scope the push qualified a query's
  *        `@/x` schema with, so it is written back as `@/x` — see
  *        `declarationsToQueriesYml`, whose default it overrides.
+ * @param {string} [params.sectionType] - the type a section that names none renders with on this
+ *        site, which the push filled in and a section's file leaves out — `siteDefaultSectionType`,
+ *        read by the caller since it reads the foundation's source
  * @returns {{ config: object, collections: object, locales: object, pages: string[], sections: string[], layout: string[], deleted: string[], renamed: object[] }}
  */
-export function siteContentDocumentToProject({ document, siteRoot, backend = null, sourceLocale = documentSourceLocale(document), prune = false, keepAuthoredFoundation = false, scope, dataModel = null }) {
+export function siteContentDocumentToProject({ document, siteRoot, backend = null, sourceLocale = documentSourceLocale(document), prune = false, keepAuthoredFoundation = false, scope, dataModel = null, sectionType = DEFAULT_SECTION_TYPE }) {
   // Before anything is written: a pull that would leave content out of the files stops here.
   refuseContentFilesCannotHold(document, sourceLocale)
 
@@ -1363,7 +1372,7 @@ export function siteContentDocumentToProject({ document, siteRoot, backend = nul
   // rename detection, build a fresh one as we project, then persist it. Items not
   // re-projected (deleted) drop out naturally. `collector` rides along to capture
   // localized scalars during the page walk.
-  const ctx = { siteRoot, oldIndex: readPullIndex(siteRoot), newIndex: {}, report, collector, sourceLocale, sectionFiles: new Map(), dataModel }
+  const ctx = { siteRoot, oldIndex: readPullIndex(siteRoot), newIndex: {}, report, collector, sourceLocale, sectionFiles: new Map(), dataModel, sectionType }
   // Where the site keeps its localized URLs — `site.yml`'s map, when it has one (`pageSlugToYml`).
   const siteMap = readAuthoredYaml(join(siteRoot, 'site.yml'))?.i18n?.routeTranslations
   ctx.routes = { siteMap: isPlainRecord(siteMap) && Object.keys(siteMap).length ? siteMap : null, slugs: new Map() }

package/src/uwx/site.js

@@ -71,10 +71,12 @@ import {
   rootOrderConfig,
   composeLocalizedRoute,
   isValidSlugSegment,
+  authoredId,
 } from '../site/content-collector.js'
 import { refuseBinding, refuseUnder, refuseOutsideLanguage, warnDuplicateBindings } from '../site/data-fetcher.js'
 import { readLayoutFolder, layoutAreaRoute } from '../site/layout-folder.js'
 import { normalizeHideIn } from '../site/nav-visibility.js'
+import { siteDefaultSectionType } from '../site/queries-config.js'
 import { resolveDefaultLocale, validateLanguageConfig, queryDataUrl } from '@uniweb/core'
 import { emitEntitySyncPackage } from './entity-document.js'
 import { loadLocaleTranslations, localizeScalar, localizeScalarList, localizeContentDoc, localesDir, isLocalizedContent, plainTextTargets } from './locale-sync.js'
@@ -116,10 +118,6 @@ function scalarString(value) {
 // processMarkdownFile takes only type/hidden/props/fetch/query/data/id out of the
 // frontmatter (and drops preset/input), so `background:` and `theme:` stay
 // inside section.params — and ride there on the wire too (`mapSectionData`).
-// The `type` a push sends for a section whose file names none — the Model requires one. A pull does
-// not write it back into a file that names none (`sectionRecordToFile`): absent, the foundation's
-// `defaultSection` renders it, which is not always `Content`.
-export const FILLED_SECTION_TYPE = 'Content'
 
 const AUTHORED_SLUG = Symbol('authoredSlug')
 const isPlainRecord = (v) => v !== null && typeof v === 'object' && !Array.isArray(v)
@@ -291,7 +289,8 @@ function mapSectionData(section) {
   // the `fetch` field beside the params, equal; a pull still reads a stored field where `params`
   // has no `fetch` (`sectionRecordToFile`). uwx-format.md § A page section's fields.
   if (section.fetch) params.fetch = section.fetch
-  const data = { type: section.type || FILLED_SECTION_TYPE } // entity type requires `type`
+  // A section whose file names no type gets one once the tree is collected (`fillSectionTypes`).
+  const data = { type: section.type }
   setIf(data, 'stable_id', section.stableId ?? undefined)
   // ⭐ A draft section — the store's own `hidden`, which an editor also writes [2026-09-28].
   if (section.hidden === true) data.hidden = true
@@ -314,7 +313,8 @@ function buildPageData(config, ctx) {
   // `localizeRouteSlugs`, once the whole tree is known. `mode` is the plain
   // delivery mode.
   const data = { slug: { [sourceLocale]: slug }, mode } // both required by the entity type
-  setIf(data, 'stable_id', config.id)
+  // An authored id is a string (`authoredId`): `id: 404` reads as a number, which a store refuses.
+  setIf(data, 'stable_id', authoredId(config.id) ?? undefined)
   setIf(data, 'title', localizeScalar(config.title, sourceLocale, translations))
   setIf(data, 'description', localizeScalar(config.description, sourceLocale, translations))
   setIf(data, 'label', localizeScalar(config.label, sourceLocale, translations))
@@ -522,6 +522,26 @@ function withIdentity(id, fields) {
   return Object.assign({ $id: id }, fields)
 }
 
+// ⭐ A SECTION WHOSE FILE NAMES NO TYPE IS SENT THE TYPE IT RENDERS WITH — the site's foundation's
+// `defaultSection`, else `Section` (`siteDefaultSectionType`, by `@uniweb/core/section-type`, the
+// rule the site's own render asks). The store requires a type, and a host renders what the store
+// holds. ⛔ Until 2026-10-23 this sent `Content`, which no starter template's foundation has: every
+// such section — every page of a mounted docs folder among them — read "Component not found:
+// Content" on a hosted site while the files rendered `Section`.
+function fillSectionTypes(records, type) {
+  for (const record of records || []) {
+    if (!record.type) record.type = type // the collector says `null` for a file that names none
+    fillSectionTypes(record.$children, type)
+  }
+}
+
+function fillPageSectionTypes(pages, type) {
+  for (const page of pages || []) {
+    fillSectionTypes(page.page_sections, type)
+    fillPageSectionTypes(page.$children, type)
+  }
+}
+
 // One collected section → its `$`-record, recursing `subsections` into `$children`
 // (page_sections is self_nesting). `$id` is the section's stableId (rename-stable),
 // falling back to a positional handle only for a truly anonymous section.
@@ -1596,6 +1616,10 @@ export async function siteProjectToDocument(siteRoot, opts = {}) {
   }
 
   const layoutSections = await collectLayoutNested(layoutDir, siteRoot)
+  // Before anything reads a section's type — localizing a data block asks it for the block's model.
+  const sectionType = await siteDefaultSectionType(siteRoot, siteYml)
+  fillPageSectionTypes(pages, sectionType)
+  fillSectionTypes(layoutSections, sectionType)
 
   // Wrap each section's content into its per-locale form (source doc + target
   // structural maps from locales/{locale}.json, or a free-form body override from