@uniweb/build 1.3.3 → 1.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "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/content-reader": "~1.4.0",
     "@uniweb/projections": "~1.1.1",
-    "@uniweb/theming": "~1.2.0",
-    "@uniweb/semantic-parser": "~1.8.0",
     "@uniweb/content-writer": "~1.1.2",
     "@uniweb/schemas": "~1.3.0",
-    "@uniweb/content-reader": "~1.3.2"
+    "@uniweb/semantic-parser": "~1.8.1",
+    "@uniweb/theming": "~1.2.0"
   },
   "optionalDependencies": {
-    "@uniweb/runtime": "~1.1.3"
+    "@uniweb/runtime": "~1.1.4"
   },
   "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.2.2",
-    "@uniweb/runtime": "~1.1.3"
+    "@uniweb/runtime": "~1.1.4",
+    "@uniweb/core": "~1.2.2"
   },
   "peerDependenciesMeta": {
     "vite": {

package/src/i18n/merge.js

@@ -392,7 +392,7 @@ function applyElementTranslation(node, context, translations, fallbackToSource)
 export function translatedInline(source, value) {
   const fragment = inlineMarkdownToFragment(value)
   if (!fragment) return null
-  return asLinkLabels(source, fragment) || fragment
+  return asLinkLabels(source, fragment, value) || fragment
 }
 
 /**
@@ -410,13 +410,13 @@ export function translationKeepsMarkup(markup, value) {
 }
 
 // The source's links with the fragment as their labels — the whole fragment for one link, a line
-// each for several — or null: the fragment names a link of its own, the source is not only links,
-// or the lines do not match the links one to one.
-function asLinkLabels(source, fragment) {
+// of the value each for several — or null: the fragment names a link of its own, the source is not
+// only links, or the lines do not match the links one to one.
+function asLinkLabels(source, fragment, value) {
   if (fragment.some((node) => linkMarkOf(node))) return null
   const links = linkRuns(source)
   if (!links) return null
-  const labels = links.length === 1 ? [trimInline(fragment)] : inlineLines(fragment)
+  const labels = links.length === 1 ? [trimInline(fragment)] : valueLines(value)
   if (labels.length !== links.length || labels.some((label) => !label.length)) return null
   const out = []
   links.forEach((link, i) => {
@@ -503,6 +503,16 @@ function sameMark(a, b) {
   return Boolean(a && b) && a.type === b.type && JSON.stringify(a.attrs || {}) === JSON.stringify(b.attrs || {})
 }
 
+// A value's lines as the translator wrote them, each read as inline markdown and split again at a
+// line break written in it (`<br>`), each trimmed; blank lines dropped. ⭐ Split BEFORE it is read:
+// a plain newline inside a paragraph reads as a space (2026-10-16), so the value, read whole, has no
+// lines left. ⛔ Until then the read value was split, at the newlines it kept.
+function valueLines(value) {
+  return String(value ?? '')
+    .split('\n')
+    .flatMap((line) => inlineLines(inlineMarkdownToFragment(line) || []))
+}
+
 // A fragment's lines, split at line breaks, each trimmed; blank lines dropped.
 function inlineLines(fragment) {
   const lines = [[]]

package/src/site/content-collector.js

@@ -1321,7 +1321,9 @@ function normalizeLayoutConfig(raw) {
   const out = {}
   if (typeof raw.name === 'string' && raw.name) out.name = raw.name
   if (Array.isArray(raw.hide)) out.hide = raw.hide
-  if (raw.params && typeof raw.params === 'object') out.params = raw.params
+  // A map, never an array: `params: []` passed a bare `typeof` check and replaced the inherited
+  // params with a list nothing reads.
+  if (raw.params && typeof raw.params === 'object' && !Array.isArray(raw.params)) out.params = raw.params
   return out
 }
 

package/src/uwx/project-writer.js

@@ -23,27 +23,23 @@ import { renderEntityDocument } from './backfill.js'
 import { queriesYmlPath } from './queries-config.js'
 import { folderYmlPath } from '../site/records-config.js'
 import { editYamlText, YAML_DUMP_OPTS } from './yaml-edit.js'
-import { DECLARATION_KEYS } from '../site/fetch-shapes.js'
+import { isSectionKey } from '@uniweb/schemas/section'
+import { DECLARATION_KEYS, authorableDeclaration } from '../site/fetch-shapes.js'
 
-// Frontmatter keys that belong to the CCA framework / the developer's local
-// authoring, not to externally-editable params. On a section write an existing
-// reserved key is preserved and never overwritten by incoming params, so a
-// projection doesn't churn fields it didn't author (the surgical-update bar).
+// Frontmatter keys a section write keeps from the file when the file has them.
 //
-// ⭐ The declaration keys — `query`, `fetch`, and the retired `data` — are one
-// group: a section that declares its data locally, under any of them, keeps that
-// declaration, and an incoming one under a different key does not land beside it
-// (a file holding two is refused by the build).
+// ⛔ Not `type`, `query`, `fetch` or the retired `data`, kept here as the developer's own from
+// the start (2026-05-30) until 2026-10-16. A pull is a checkout: a teammate's push changes
+// them, and an editor changes a section's data declaration. A pull that kept the file's
+// value still recorded the backend's version as taken, so the next edit to the section
+// pushed the file's value back over the backend's, with no refusal (measured with a
+// section's `fetch:`). The declaration is written by `writeSectionFile`'s `declaration`.
+// ⛔ Not `hidden` either: an editor toggles it, so a pull must carry the store's value into
+// the file (2026-09-28).
 export const DEFAULT_RESERVED_FRONTMATTER = new Set([
-  'type',
   'preset',
   'input',
-  'query',
-  'fetch',
-  'data',
   'nest',
-  // ⛔ Not `hidden`, which was here from the start (2026-05-30) with no reason recorded: an
-  // editor toggles it, so a pull must carry the store's value into the file (2026-09-28).
 ])
 
 /**
@@ -154,22 +150,30 @@ function assembleSection(frontmatter, body) {
 }
 
 /**
- * Write a section's `.md` file: merge incoming `params` into the existing
- * frontmatter (preserving reserved keys), serialize `content` (ProseMirror) to
- * the markdown body, and write idempotently. When the file is new there is no
- * existing frontmatter/body to preserve. When `content` is omitted, the existing
+ * Write a section's `.md` file as the backend holds the section: its `params` and its
+ * data `declaration` replace the file's, `content` (ProseMirror) becomes the markdown
+ * body, and the file is written only when that changes it. When the file is new there
+ * is no existing frontmatter/body to preserve. When `content` is omitted, the existing
  * body is kept (a params-only update).
  *
+ * ⭐ `params` is the section's whole set: a param the file holds and `params` does not —
+ * one a push would send (`isSectionKey`, the collector's own test) — is removed. ⛔ Until
+ * 2026-10-16 incoming params were merged into the file's, so a param removed elsewhere
+ * stayed in the file, and the next edit to the section pushed it back.
+ *
  * @param {object} opts
  * @param {string} opts.filePath
  * @param {object} [opts.content] - ProseMirror document for the body
- * @param {object} [opts.params] - incoming frontmatter params to merge
+ * @param {object} [opts.params] - the section's frontmatter params as the backend holds them
+ * @param {object|object[]|null} [opts.declaration] - the section's `fetch` off the wire, written
+ *        under the declaration key the file uses (`authorableDeclaration`); `null` when the
+ *        section declares none, which removes the file's. Left out, the file's declaration stays
  * @param {Set<string>} [opts.reserved] - keys preserved when already present
  * @param {object} [opts.implied] - `{ key: value }` a file means by leaving `key` out; an incoming
  *        value equal to it is not written into an existing file that leaves the key out
  * @returns {'updated'|'unchanged'}
  */
-export function writeSectionFile({ filePath, content, params, reserved = DEFAULT_RESERVED_FRONTMATTER, implied = null }) {
+export function writeSectionFile({ filePath, content, params, declaration, reserved = DEFAULT_RESERVED_FRONTMATTER, implied = null }) {
   let existing = ''
   try {
     existing = readFileSync(filePath, 'utf8')
@@ -179,21 +183,29 @@ export function writeSectionFile({ filePath, content, params, reserved = DEFAULT
   const { frontmatter, body: existingBody } = parseFrontmatter(existing, filePath)
 
   const nextFrontmatter = { ...frontmatter }
-  const declaresLocally = DECLARATION_KEYS.some((k) => k in frontmatter)
   if (params) {
     for (const [key, value] of Object.entries(params)) {
-      // A reserved key is preserved only when it already exists locally (the
-      // developer owns it; an incoming edit must not clobber it). On a new file
-      // there is nothing to protect, so the incoming value fills it — that's
-      // how a newly-projected section gets its `type`/`nest`/etc.
+      // A reserved key is preserved only when it already exists locally. On a new file there is
+      // nothing to protect, so the incoming value fills it.
       if (reserved.has(key) && key in frontmatter) continue
-      if (reserved.has(key) && DECLARATION_KEYS.includes(key) && declaresLocally) continue
       // A value the file implies by leaving the key out (`implied`) is not written into a file that
       // exists — a new file has nothing to imply it with.
       if (implied && existing && !(key in frontmatter) && implied[key] === value) continue
       if (value === null || value === undefined) delete nextFrontmatter[key]
       else nextFrontmatter[key] = value
     }
+    for (const key of Object.keys(frontmatter)) {
+      if (key in params || reserved.has(key) || key === 'fetch' || isSectionKey(key)) continue
+      delete nextFrontmatter[key]
+    }
+  }
+  // ⭐ The declaration keys — `query`, `fetch`, and the retired `data` — are one group: exactly one
+  // is written, under the key the file already uses where it can say the declaration, and the
+  // others are removed (a file holding two is refused by the build).
+  if (declaration !== undefined) {
+    const incoming = declaration === null ? null : authorableDeclaration(declaration, frontmatter)
+    for (const key of DECLARATION_KEYS) if (key !== incoming?.key) delete nextFrontmatter[key]
+    if (incoming) nextFrontmatter[incoming.key] = incoming.value
   }
 
   // ⭐ AN UNCHANGED BODY KEEPS THE AUTHOR'S OWN TEXT. A body that parses to the document the pull brought

package/src/uwx/site-project.js

@@ -405,20 +405,23 @@ export function sectionRecordToFile({ filePath, record, sourceLocale = LOCALIZED
   // `params`, so one stored there counts when the field is absent.
   frontmatter.hidden = (typeof hidden === 'boolean' ? hidden : paramHidden === true) ? true : undefined
   Object.assign(frontmatter, paramsRest)
-  // Invert the build's resolution rather than copy it — see fetch-shapes.js. A new
-  // file gets `query:` for a declaration of names alone; a section that declares
-  // its data locally keeps it (`writeSectionFile`, the declaration keys).
-  // ⭐ From `params.fetch` — where a section carries its data since 2026-09-28.
-  if (paramFetch !== undefined) {
-    const { key, value } = authorableDeclaration(paramFetch)
-    frontmatter[key] = value
-  }
   // `id:` only where the file's name does not already give it (`writeId`, `pageSectionsToFiles`).
   if (stable_id !== undefined && writeId) frontmatter.id = stable_id
 
+  // ⭐ The data declaration, from `params.fetch` — where a section carries its data since
+  // 2026-09-28 — is the backend's: written under the key the file already uses, else `query:`
+  // 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.
-  return writeSectionFile({ filePath, content: sourceContent, params: frontmatter, implied: { type: FILLED_SECTION_TYPE } })
+  return writeSectionFile({
+    filePath,
+    content: sourceContent,
+    params: frontmatter,
+    declaration: paramFetch ?? null,
+    implied: { type: FILLED_SECTION_TYPE },
+  })
 }
 
 // ---------------------------------------------------------------------------