@uniweb/build 0.63.4 → 0.64.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "0.63.4",
+  "version": "0.64.0",
   "description": "Build tooling for the Uniweb Component Web Platform",
   "type": "module",
   "exports": {
@@ -57,15 +57,15 @@
     "js-yaml": "^4.1.0",
     "sharp": "^0.35.3",
     "yaml": "^2.5.0",
-    "@uniweb/content-writer": "^0.3.4",
-    "@uniweb/projections": "^0.7.3",
-    "@uniweb/schemas": "^0.7.0",
-    "@uniweb/content-reader": "^1.2.5",
+    "@uniweb/projections": "^0.7.4",
     "@uniweb/semantic-parser": "^1.4.1",
-    "@uniweb/theming": "^0.1.15"
+    "@uniweb/schemas": "^0.7.0",
+    "@uniweb/theming": "^0.1.15",
+    "@uniweb/content-writer": "^0.3.4",
+    "@uniweb/content-reader": "^1.2.5"
   },
   "optionalDependencies": {
-    "@uniweb/runtime": "^0.27.4"
+    "@uniweb/runtime": "^0.27.5"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",
@@ -74,8 +74,8 @@
     "@tailwindcss/vite": "^4.0.0",
     "@vitejs/plugin-react": "^4.0.0 || ^5.0.0",
     "vite-plugin-svgr": "^4.0.0",
-    "@uniweb/core": "^0.29.8",
-    "@uniweb/runtime": "^0.27.4"
+    "@uniweb/core": "^0.30.0",
+    "@uniweb/runtime": "^0.27.5"
   },
   "peerDependenciesMeta": {
     "vite": {

package/src/i18n/extract.js

@@ -127,6 +127,23 @@ function extractFromPageMeta(page, pageRoute, units) {
   }
 }
 
+/**
+ * Where a translation applies — `{ page, section }`, the key a context-specific override is written
+ * under (`"<page>:<section>"`): the page's route and the section's STABLE id. One rule for the
+ * extractor, the build (`merge.js`), the push and the pull.
+ *
+ * ⛔ The section was its build `id` until 2026-09-26 — a numbered file's number (`/about:1` for
+ * `1-hero.md`) — so an override moved to another section when files were renumbered, and a clone,
+ * whose files are not numbered, could not key it at all.
+ *
+ * @param {Object} section - a section with `stableId` (and the build `id` as a fallback)
+ * @param {string} pageRoute - the route of the page (or layout area) it is on
+ * @returns {{ page: string, section: string }}
+ */
+export function translationContext(section, pageRoute) {
+  return { page: pageRoute, section: section?.stableId || section?.id || 'unknown' }
+}
+
 /**
  * Extract translatable content from a section
  * @param {Object} section - Section data
@@ -134,8 +151,7 @@ function extractFromPageMeta(page, pageRoute, units) {
  * @param {Object} units - Units accumulator
  */
 function extractFromSection(section, pageRoute, units) {
-  const sectionId = section.id || 'unknown'
-  const context = { page: pageRoute, section: sectionId }
+  const context = translationContext(section, pageRoute)
 
   // Extract from parsed semantic content if available
   // The section.content is ProseMirror doc, but we need parsed content
@@ -173,10 +189,11 @@ function extractFromSection(section, pageRoute, units) {
  * than tidy: `deriveStructuralMap` recovers a pulled translation by walking
  * block elements, so a data string translated on the sync wire would be
  * invisible to it — neither captured in the map nor counted as divergence — and
- * would be silently lost on the next pull. So this lane is the BUILD lane only
- * (the manifest, and `dist/{locale}/`), which is where the reported bug lives.
- * Carrying data-block translations across the sync wire needs a representation
- * that contract does not have yet.
+ * would be silently lost on the next pull. ⭐ Since 2026-09-26 both halves exist:
+ * the push translates data blocks (`merge.js::resolveDocForLocale`) and the pull
+ * reads their strings back pairwise (`uwx/locale-sync.js::deriveStructuralMap`),
+ * as the same per-string entries this lane writes — the block-element keying
+ * contract is untouched.
  */
 function extractFromDataBlocks(doc, context, units) {
   for (const node of dataBlockNodes(doc)) {
@@ -192,7 +209,7 @@ function extractFromDataBlocks(doc, context, units) {
 /**
  * Every tagged data block in a doc, including any nested inside a container.
  */
-function dataBlockNodes(doc) {
+export function dataBlockNodes(doc) {
   const out = []
   const walk = (nodes) => {
     for (const node of nodes || []) {

package/src/i18n/freeform.js

@@ -25,6 +25,7 @@ import yaml from 'js-yaml'
 import { poolDirsForSchema, schemaForPoolDirs, RECORDS_DIR } from '../site/entity-pool.js'
 import { parseFrontmatter } from '../utils/frontmatter.js'
 import { computeSourceHash } from './freeform-manifest.js'
+import { layoutAreaRoute } from '../site/layout-folder.js'
 
 // Try to import content-reader for markdown → ProseMirror conversion
 let markdownToProseMirror
@@ -327,7 +328,7 @@ function freeformSections(siteContent) {
     if (!areas || typeof areas !== 'object') continue
     for (const [areaKey, layoutPage] of Object.entries(areas)) {
       if (!layoutPage?.sections) continue
-      const route = layoutPage.route || `/layout/${layoutName === 'default' ? '' : layoutName + '/'}${areaKey}`
+      const route = layoutPage.route || layoutAreaRoute(layoutName, areaKey)
       visit(layoutPage.sections, { ...layoutPage, route })
     }
   }

package/src/i18n/merge.js

@@ -14,7 +14,7 @@
 
 import { computeHash } from './hash.js'
 import { loadFreeformTranslation } from './freeform.js'
-import { elementText, blockElements } from './extract.js'
+import { elementText, blockElements, translationContext } from './extract.js'
 import { visitDataStrings } from './data-strings.js'
 
 // Inline-markdown → ProseMirror inline fragment, for resolving a whole-element
@@ -268,8 +268,7 @@ function translatePageMeta(page, pageRoute, translations, fallbackToSource) {
  * Translate a section's content (synchronous, hash-based only)
  */
 function translateSectionSync(section, pageRoute, translations, fallbackToSource) {
-  const sectionId = section.id || 'unknown'
-  const context = { page: pageRoute, section: sectionId }
+  const context = translationContext(section, pageRoute)
 
   if (section.content?.type === 'doc') {
     translateProseMirrorDoc(section.content, context, translations, fallbackToSource)
@@ -292,8 +291,7 @@ function translateSectionSync(section, pageRoute, translations, fallbackToSource
 async function translateSectionAsync(section, page, translations, options) {
   const { fallbackToSource, locale, localesDir } = options
   const pageRoute = page.route || '/'
-  const sectionId = section.id || 'unknown'
-  const context = { page: pageRoute, section: sectionId }
+  const context = translationContext(section, pageRoute)
 
   // Check for free-form translation first
   const freeform = await loadFreeformTranslation(section, page, locale, localesDir)
@@ -355,23 +353,27 @@ function applyElementTranslation(node, context, translations, fallbackToSource)
  * in place. The other half of the fix in `extract.js` — a manifest entry nobody
  * applies is worse than no entry, because a translator has already done the work.
  *
- * Called from the two BUILD-lane section walks only, deliberately, and NOT from
- * `resolveDocForLocale`. See `extractFromDataBlocks` for why: the sync wire's
- * structural map is derived by walking block elements, so a translated data
- * payload there would be neither captured nor flagged as divergent, and would be
- * dropped on the next pull. Losing a translation silently is worse than not
- * carrying one yet.
+ * Called from the build's two section walks and from `resolveDocForLocale`, the
+ * push's. ⛔ The push was left out deliberately until 2026-09-26, because the
+ * pull could not read a translated data block back and would have dropped it
+ * silently; it now does (`uwx/locale-sync.js::deriveStructuralMap`), so the two
+ * halves travel together.
+ *
+ * @returns {boolean} whether any value was translated
  */
 function translateDataBlocks(doc, context, translations, fallbackToSource) {
+  let changed = false
   const walk = (nodes) => {
     for (const node of nodes || []) {
       if (!node) continue
       if (node.type === 'dataBlock') {
         const data = node.attrs?.data
         if (data && typeof data === 'object') {
-          visitDataStrings(data, (value) =>
-            lookupTranslation(value, context, translations, fallbackToSource)
-          )
+          visitDataStrings(data, (value) => {
+            const translated = lookupTranslation(value, context, translations, fallbackToSource)
+            if (translated !== value) changed = true
+            return translated
+          })
         }
       } else if (Array.isArray(node.content)) {
         walk(node.content)
@@ -379,6 +381,7 @@ function translateDataBlocks(doc, context, translations, fallbackToSource) {
     }
   }
   walk(doc?.content)
+  return changed
 }
 
 /**
@@ -393,8 +396,9 @@ function translateDataBlocks(doc, context, translations, fallbackToSource) {
 export function resolveDocForLocale(sourceDoc, table, context = { page: '', section: '' }) {
   if (!sourceDoc || sourceDoc.type !== 'doc' || !table) return null
   const doc = JSON.parse(JSON.stringify(sourceDoc))
-  const changed = translateProseMirrorDoc(doc, context, table, true)
-  return changed ? doc : null
+  const elements = translateProseMirrorDoc(doc, context, table, true)
+  const data = translateDataBlocks(doc, context, table, true)
+  return elements || data ? doc : null
 }
 
 // Parse an inline-markdown translation value into a ProseMirror inline fragment.
@@ -440,7 +444,8 @@ function lookupTranslation(source, context, translations, fallbackToSource) {
 
   // Handle translation with overrides
   if (typeof translation === 'object') {
-    const contextKey = `${context.page}:${context.section}`
+    // A record's context is its identity (`context.key`, `records.js`); a section's, its page and id.
+    const contextKey = context?.key ?? `${context.page}:${context.section}`
 
     // Check for context-specific override
     if (translation.overrides?.[contextKey]) {