@uniweb/build 0.80.0 → 0.80.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "0.80.0",
+  "version": "0.80.2",
   "description": "Build tooling for the Uniweb Component Web Platform",
   "type": "module",
   "exports": {
@@ -57,11 +57,11 @@
     "js-yaml": "^4.1.0",
     "sharp": "^0.35.3",
     "yaml": "^2.5.0",
-    "@uniweb/semantic-parser": "^1.5.1",
-    "@uniweb/projections": "^0.7.15",
+    "@uniweb/content-reader": "^1.2.8",
     "@uniweb/content-writer": "^0.3.4",
     "@uniweb/schemas": "^0.13.0",
-    "@uniweb/content-reader": "^1.2.8",
+    "@uniweb/projections": "^0.7.15",
+    "@uniweb/semantic-parser": "^1.5.1",
     "@uniweb/theming": "^0.2.0"
   },
   "optionalDependencies": {

package/src/i18n/merge.js

@@ -443,7 +443,7 @@ function linkRuns(source) {
         runs.push({ link, marks: [...node.marks], before: gap })
       }
       gap = []
-    } else if (node.type === 'hardBreak' || (node.type === 'text' && !node.marks?.length && !node.text?.trim())) {
+    } else if (isGap(node)) {
       gap.push(node)
     } else {
       return null
@@ -452,6 +452,49 @@ function linkRuns(source) {
   return runs.length ? runs : null
 }
 
+// What may sit between two links of an element made only of links: a line break, or spaces.
+function isGap(node) {
+  return node.type === 'hardBreak' || (node.type === 'text' && !node.marks?.length && !node.text?.trim())
+}
+
+/**
+ * The labels of a translated element made only of links — `asLinkLabels` the other way, for a
+ * pull: one run of the target's own nodes per link of the source's, each without the marks its
+ * link carries. Null when the source is not only links, or the target's links are not the source's
+ * own, one to one and in order.
+ *
+ * ⚠️ It does not ask whether the merge reads the labels back to the target — a caller does
+ * (`uwx/locale-sync.js`), since only then are they the same translation.
+ *
+ * @param {Array} source - the element's source inline content
+ * @param {Array} target - the element's translated inline content
+ * @returns {Array<Array>|null} each link's label, as inline nodes
+ */
+export function linkLabels(source, target) {
+  const links = linkRuns(source)
+  if (!links) return null
+  const labels = []
+  let current = null
+  for (const node of target || []) {
+    if (!node) continue
+    const link = linkMarkOf(node)
+    if (link) {
+      if (!current || !sameMark(current, link)) {
+        const next = links[labels.length]
+        if (!next || !sameMark(next.link, link)) return null
+        labels.push([])
+        current = link
+      }
+      labels[labels.length - 1].push(withoutMarks(node, links[labels.length - 1].marks))
+    } else if (isGap(node)) {
+      current = null
+    } else {
+      return null
+    }
+  }
+  return labels.length === links.length ? labels : null
+}
+
 function linkMarkOf(node) {
   return node?.type === 'text' ? node.marks?.find((mark) => mark.type === 'link') || null : null
 }
@@ -493,6 +536,13 @@ function withMarks(node, marks) {
   return { ...node, marks: [...marks, ...own] }
 }
 
+// A label node without its link's marks — `withMarks` the other way.
+function withoutMarks(node, marks) {
+  const own = (node.marks || []).filter((mark) => !marks.some((linkMark) => linkMark.type === mark.type))
+  const { marks: _linkMarks, ...rest } = node
+  return own.length ? { ...rest, marks: own } : rest
+}
+
 /**
  * Translate the human-readable strings inside a section's TAGGED DATA BLOCKS,
  * in place. The other half of the fix in `extract.js` — a manifest entry nobody

package/src/site/queries-config.js

@@ -78,8 +78,10 @@ export const QUERIES_YML_RELPATH = 'queries.yml'
 // Identity has no boundary to get wrong, and an author wanting a different schema
 // name writes `schema:`, which is one line and says what it means.
 //
-// Exported so the inverse (projection) can drop a `schema:` that merely restates
-// this default, keeping a projected queries.yml as terse as the author left it.
+// ⛔ A pull does not drop a `schema:` equal to this default: it writes the schema the site holds,
+// in its one spelling (`uwx/records-project.js::declToFileShape`). Until 2026-10-08 it did, keeping
+// a projected queries.yml as terse as the author left it — and a clone, with no author's file to
+// look at, wrote `series: { schema: '@/series' }` back as `series: {}`.
 export function defaultSchema(name) {
   return `@/${name}`
 }

package/src/uwx/locale-sync.js

@@ -24,7 +24,7 @@ import { proseMirrorToMarkdown, serializeInlineContent } from '@uniweb/content-w
 import { computeHash } from '../i18n/hash.js'
 import { blockElements, elementText, dataBlockNodes } from '../i18n/extract.js'
 import { visitDataBlockStrings } from '../i18n/data-strings.js'
-import { resolveDocForLocale } from '../i18n/merge.js'
+import { resolveDocForLocale, translatedInline, linkLabels } from '../i18n/merge.js'
 import { computeSourceHash } from '../i18n/freeform-manifest.js'
 import { sameMarkdownDocument, canonicalJson } from './same-content.js'
 
@@ -380,7 +380,7 @@ function deriveStructuralMap(sourceDoc, targetDoc, modelFor = () => null) {
       const srcMd = serializeInlineContent(src[i].content || [])
       const tgtMd = serializeInlineContent(tgt[i].content || [])
       if (srcMd === tgtMd) continue // unchanged → untranslated → omit
-      map[key] = tgtMd
+      map[key] = labelsAlone(src[i].content || [], tgt[i].content || [], tgtMd) ?? tgtMd
     }
   } catch {
     // a mark we can't serialize → don't risk a lossy map; store as free-form
@@ -389,6 +389,22 @@ function deriveStructuralMap(sourceDoc, targetDoc, modelFor = () => null) {
   return addDataBlockStrings(map, sourceDoc, targetDoc, modelFor)
 }
 
+// ⭐ A LINK'S LABEL, NOT THE LINK, when only its words were translated. The merge reads a label onto
+// the source's own link (`merge.js::translatedInline`), so it keeps following that link wherever the
+// source moves it, where `[Donar Ahora](/contact)` would keep `/contact`. Several links are a label a
+// line, as a translator writes them. Written only when the merge reads it back to this very element;
+// a link a translator changed — the Spanish button pointed at a Spanish page — is written whole.
+// ⛔ Until 2026-10-08 the element was always written whole: once the merge read a label (2026-10-01),
+// a pull into the copy that pushed rewrote `"Donar Ahora"` as `"[Donar Ahora](/contact)"`, and split a
+// string a page title and a button share into a default and per-place overrides.
+function labelsAlone(source, target, whole) {
+  const labels = linkLabels(source, target)
+  if (!labels) return null
+  const value = labels.map((nodes) => serializeInlineContent(nodes)).join('\n')
+  const back = translatedInline(source, value)
+  return back && serializeInlineContent(back) === whole ? value : null
+}
+
 // ⭐ A TAGGED DATA BLOCK's translated strings, read pairwise — the strings the build translates
 // (`visitDataBlockStrings`: a block's declared shape, else the extractor's heuristic), keyed by their
 // source text as the build keys them. ⭐ Walked by the same model the push translated with — the pairing

package/src/uwx/queries-config.js

@@ -4,7 +4,6 @@
 export {
   resolveQueriesConfig,
   queriesYmlPath,
-  defaultSchema,
   foundationDataSchemas,
   foundationSchemaJson,
   QUERIES_YML_RELPATH,

package/src/uwx/records-project.js

@@ -41,7 +41,7 @@ import yaml from 'js-yaml'
 import { YAML_OPTIONS } from '../utils/yaml-schema.js'
 import { parseFrontmatter } from './entity-source.js'
 import { writeRecordFile, writeQueriesConfig, writeRecordsConfig } from './project-writer.js'
-import { defaultSchema, foundationDataSchemas, foundationSchemaJson, QUERIES_YML_RELPATH } from './queries-config.js'
+import { foundationDataSchemas, foundationSchemaJson, QUERIES_YML_RELPATH } from './queries-config.js'
 import { dataKeyTypes } from './data-key-types.js'
 import { poolDirsForSchema, schemaForPoolDirs, resolveRecordsDir } from '../site/entity-pool.js'
 import { folderYmlPath } from '../site/records-config.js'
@@ -277,8 +277,8 @@ function setIf(obj, key, value) {
 //  - `path:` is written VERBATIM, and omitted entirely when it equals the default
 //    (the query's own name under the pool).
 //  - `url:` (remote source) and a bare `source:` object are carried as-is.
-//  - `schema:` is dropped when it only restates the query-name convention default,
-//    so a terse author file stays terse.
+//  - `schema:` is written as the site holds it — the query-name default included —
+//    except a query typed by a data key, kept short where its type can be read again.
 //
 // ⛔ THE `collections/`-PREFIX STRIP AND THE site.yml ROUTING ARE BOTH GONE, and
 // they went together. They existed because `collections.yml` sat INSIDE
@@ -342,24 +342,31 @@ function declToFileShape(wire, scope = null, own = null, keyTypes = null, author
     decl.source = source
   }
 
-  // The default is the query's name — or, when no data schema has that name, the type the
-  // foundation declares for the data key of that name (`data-key-types.js`), which is what a
-  // push sent in its place. Either one stays unwritten, so the terse file stays terse.
-  // ⛔ UNLESS THE AUTHOR WROTE IT: a `schema:` the local file already states for this query is
-  // written back as it is. Until 2026-09-25 a pull into a working copy dropped international's
-  // `articles: { schema: '@std/article' }`, because a section types `articles` as `@std/article`.
-  // ⭐ A CLONE GOES BY THE MARK. Where the key's type comes only from the registered foundation a
-  // project keeps (`markedOnly`: its foundation is a catalog ref), a query is written terse only when
-  // the push marked it `typed_by_data_key` — the author wrote no schema — or when the author's own
-  // file declares it with none. Unmarked, the schema was the author's, and it is written.
+  // ⭐ THE SCHEMA THE SITE HOLDS IS WRITTEN — one spelling per meaning [Diego, 2026-10-08]. A
+  // query left to its name's default (`series` → `@/series`) comes back with that schema stated:
+  // `series: {}` and `series: { schema: '@/series' }` read the same records, and a clone, with no
+  // file of the author's to look at, could not tell which was written. ⛔ Until 2026-10-08 a schema
+  // equal to the default stayed unwritten unless the local file stated it, so a clone turned an
+  // author's `series: { schema: '@/series' }` into `series: {}`.
+  //
+  // ⛔ EXCEPT A QUERY TYPED BY A DATA KEY, which is not a second spelling of anything: `team:` reads
+  // its own folder, `records/team/`, as the type the foundation's data key declares
+  // (`data-key-types.js`), where `team: { schema: '@/member' }` would read `records/member/`. It
+  // stays as written — short — but only where this project can read it as that type again: the
+  // foundation's types (its own, or the registered version a clone keeps) give its name the schema
+  // the site holds. Then the push's mark says so (`typed_by_data_key`), or the author's file
+  // declares it short, or — the foundation in this project — the file does not declare it. An
+  // author's stated schema is never taken for one. ⛔ With no types to read, short would mean
+  // `@/team`: the schema is written, and the records go to its folder, so the copy still pushes it.
   const written = name ? authored?.get(name) : undefined
-  const typedHere = !markedOnly || wire.typed_by_data_key === true || written === null
-  const keyType = name && !own?.has(name) && typedHere ? keyTypes?.get(name) : null
+  const keyType = name && !own?.has(name) ? keyTypes?.get(name) : null
   // In the author's form: the registered version names the type qualified (`@acme/member`).
   const keyDefault = keyType ? unresolveSelfScope(keyType, scope, own) : null
-  if (d.schema && (d.schema === written || (d.schema !== defaultSchema(name) && d.schema !== keyDefault))) {
-    decl.schema = d.schema
-  }
+  const typedByKey =
+    keyDefault !== null &&
+    d.schema === keyDefault &&
+    (wire.typed_by_data_key === true || written === null || (written === undefined && !markedOnly))
+  if (d.schema && !typedByKey) decl.schema = d.schema
   setIf(decl, 'sort', d.sort)
   setIf(decl, 'where', d.where)
   setIf(decl, 'limit', d.limit)

package/src/uwx/site-project.js

@@ -47,8 +47,7 @@ import { declarationsToQueriesYml } from './records-project.js'
 import { FILLED_SECTION_TYPE, buildRouteOf } from './site.js'
 import { translationContext, SITE_META_CONTEXT } from '../i18n/extract.js'
 import { authorableDeclaration, DECLARATION_KEYS } from '../site/fetch-shapes.js'
-import { createTranslationCollector, writeLocaleTranslations, writeFreeformTranslations, unwrapLocalizedContent, localesDir } from './locale-sync.js'
-import { resolveLocaleList } from '../i18n/locales.js'
+import { createTranslationCollector, writeLocaleTranslations, writeFreeformTranslations, unwrapLocalizedContent } from './locale-sync.js'
 import { buildFreeformPath, freeformPathsFor } from '../i18n/freeform.js'
 import { unwrapLocalized, unwrapLocalizedList } from './backfill.js'
 import { LOCALIZED_FIELD_ASSUMPTION } from './localize.js'
@@ -214,7 +213,7 @@ function readAuthoredYaml(filePath) {
  * @returns {{ siteConfig: string, theme?: string, headHtml?: string }} per-file
  *          write status ('updated' | 'unchanged')
  */
-export function siteInfoToConfig({ document, siteRoot, backend = null, sourceLocale = LOCALIZED_FIELD_ASSUMPTION.defaultSourceLocale, collector, keepAuthoredFoundation = false, deferLanguages = false }) {
+export function siteInfoToConfig({ document, siteRoot, backend = null, sourceLocale = LOCALIZED_FIELD_ASSUMPTION.defaultSourceLocale, collector, keepAuthoredFoundation = false }) {
   const info = document?.info || {}
   const settingsSection = document?.settings || {}
 
@@ -325,18 +324,14 @@ export function siteInfoToConfig({ document, siteRoot, backend = null, sourceLoc
     }
   }
 
-  // ⭐ `languages` for a site whose `site.yml` declares none is judged once the pull has written the
-  // translation files (`deferLanguages`, `siteContentDocumentToProject`): a push sends the list those
-  // files make (`uwx/site.js::settingsNested`), and writing it back would turn "every translation
-  // file" into a fixed list.
-  let pendingLanguages
-  if (deferLanguages && siteChanges.languages !== undefined && !('languages' in (readAuthoredYaml(join(siteRoot, 'site.yml')) || {}))) {
-    pendingLanguages = siteChanges.languages
-    delete siteChanges.languages
-  }
-
+  // ⭐ `languages` IS WRITTEN AS THE SITE HOLDS IT — one spelling per meaning [Diego, 2026-10-08]:
+  // "It's definitely good for the case of languages." A site whose `site.yml` declared none sent the
+  // list its translation files make (`uwx/site.js::settingsNested`), and that list comes back stated,
+  // so a clone and the copy that pushed it say the same thing. ⛔ Until 2026-10-08 the list was held
+  // back where the translation files the pull wrote made the same one, so a clone of a site that
+  // declared `languages: [en, fr]` had no `languages:` at all — and followed its translation files
+  // where the site it came from had a fixed list.
   const result = { siteConfig: writeSiteConfig(siteRoot, siteChanges) }
-  if (pendingLanguages !== undefined) result.pendingLanguages = pendingLanguages
 
   // theme (whole object) → theme.yml.
   if (settingsSection.theme && typeof settingsSection.theme === 'object') {
@@ -1121,7 +1116,7 @@ export function siteContentDocumentToProject({ document, siteRoot, backend = nul
     backend ? readBackendState(siteRoot, backend).assets || {} : {}
   )
 
-  report.config = siteInfoToConfig({ document, siteRoot, backend, sourceLocale, collector, keepAuthoredFoundation, deferLanguages: true })
+  report.config = siteInfoToConfig({ document, siteRoot, backend, sourceLocale, collector, keepAuthoredFoundation })
   report.queries = declarationsToQueriesYml({ document, siteRoot, scope })
 
   // The uuid identity index (gitignored `.uniweb/`): read the prior map to anchor
@@ -1162,18 +1157,6 @@ export function siteContentDocumentToProject({ document, siteRoot, backend = nul
   report.locales = writeLocaleTranslations(siteRoot, collector.byLocale)
   // Target-locale FREE-FORM bodies → locales/freeform/{locale}/<relpath> + manifest.
   report.freeform = writeFreeformTranslations(siteRoot, collector.freeformPending)
-  // The site's languages, for a site.yml that declares none (`siteInfoToConfig`) — written only where
-  // the translation files, now written, would not make the same list, or where `publishLanguages`
-  // needs a declared list to draw from: the build refuses one without it.
-  if (report.config?.pendingLanguages !== undefined) {
-    const pulled = report.config.pendingLanguages
-    delete report.config.pendingLanguages
-    const site = readAuthoredYaml(join(siteRoot, 'site.yml')) || {}
-    const source = site.defaultLanguage || sourceLocale
-    const made = new Set([source, ...resolveLocaleList(undefined, localesDir(siteRoot))])
-    const same = Array.isArray(pulled) && pulled.length === made.size && pulled.every((l) => made.has(l))
-    if (!same || site.publishLanguages !== undefined) writeSiteConfig(siteRoot, { languages: pulled })
-  }
   writePullIndex(siteRoot, ctx.newIndex)
   return report
 }

package/src/uwx/yaml-edit.js

@@ -45,9 +45,18 @@ function columnOf(text, key) {
   return /^ *$/.test(lead) ? lead.length : null
 }
 
-/** Where a pair's text ends: after its value, its trailing comment and its newline. */
+/**
+ * Where a pair's text ends: after its value, its trailing comment and its newline.
+ *
+ * ⛔ A SCALAR ENDS WHERE ITS OWN TEXT DOES — `range[1]`, then the rest of that line. Its
+ * `range[2]` also spans the comment lines that follow it, and for an empty value (`team:`)
+ * every comment and blank line up to the next key, at any indentation: those belong to what
+ * comes next. ⛔ Until 2026-10-08 this read `range[2]`, and a pull that gave a bare `team:` its
+ * schema deleted the blank line and the `# Build options` heading under it in `site.yml`.
+ */
 function pairEnd(text, pair) {
-  let end = (pair.value ?? pair.key).range[2]
+  const node = pair.value ?? pair.key
+  let end = isScalar(node) ? node.range[1] : node.range[2]
   if (text[end - 1] !== '\n') {
     const nl = text.indexOf('\n', end)
     const rest = nl === -1 ? text.slice(end) : text.slice(end, nl)
@@ -169,6 +178,17 @@ function editMap(text, map, before, after, edits, dump) {
         continue
       }
     }
+    // ⭐ A BARE KEY GIVEN A VALUE KEEPS ITS LINE — and any comment the author wrote on it — and
+    // the value goes under it: `team:  # the people` gains `  schema: '@/team'` beneath.
+    const bare = isScalar(value) && value.value === null && value.range[0] === value.range[1]
+    if (bare && (isPlainObject(next) || Array.isArray(next))) {
+      const whole = indented(dump({ [key]: next }), col, false)
+      const nl = whole.indexOf('\n')
+      if (nl !== -1 && nl < whole.length - 1) {
+        edits.push({ start: stop, end: stop, text: (text[stop - 1] === '\n' ? '' : '\n') + whole.slice(nl + 1) })
+        continue
+      }
+    }
     // Written whole — in flow style when the author wrote it that way (`tags: [a, b]`).
     const flow = (isMap(value) || isSeq(value)) && value.flow
     edits.push({