@uniweb/build 0.77.0 → 0.78.0

package/src/uwx/sync-package.js

@@ -28,6 +28,7 @@ import { siteProjectToDocument } from './site.js'
 import { siteSelfScope, refuseOrgOption } from './self-scope.js'
 import { stampUnitUuids, collectUnitUuids } from './site-diff.js'
 import { emitEntitySyncPackage } from './entity-document.js'
+import { recordQueriesShown } from './shown-records.js'
 import { isLocalAssetPath } from '../site/assets.js'
 
 const SITE_MODEL_NAME = '@uniweb/site-content'
@@ -42,17 +43,28 @@ const cacheKey = (entity) => `${entity.model} ${entity.id}`
 // uuid→version map (the sync-cache); an entity the map doesn't know is left
 // unconditional rather than guessed at. See entity-document.js for what the
 // token means on the wire.
-const withBaseVersion = (baseVersions, itemBaseVersions) => (entity) => {
+const withBaseVersion = (baseVersions, itemBaseVersions, { every = false } = {}) => (entity) => {
   const uuid = entity?.document?.$uuid
   const v = uuid ? baseVersions[uuid] : null
-  // Per-item preconditions, narrowed to the records THIS package actually carries.
-  // The cache spans the whole site, but a package holds only what changed; sending
-  // tokens for absent records would bloat the manifest and assert preconditions on
-  // items we are not touching.
+  // Per-item preconditions.
+  //
+  // ⭐ THE SITE-CONTENT ENTITY SENDS EVERY VERSION THIS COPY HOLDS (`every`), for items
+  // present AND for items the files dropped. A push deletes only the items it holds a
+  // version for, and only while the site left them unchanged — so a dropped item's
+  // version is what makes leaving it out a deletion, and without it the item is kept
+  // [Diego, 2026-10-07; backend's gate, kb/framework/plans/services-exchange.md]. The
+  // caller holds a version only for an item it has seen (`heldTokens`, cli), so none is
+  // ever sent for an item the backend holds and this copy does not.
+  // ⛔ Until then this narrowed to the units the document carried: a dropped page was
+  // deleted by today's rule anyway, and nothing else was sent a version.
+  //
+  // Any other entity: narrowed to the units it carries, as before — the records lane
+  // is gated by its entity version, and sends none.
   let items = null
   if (itemBaseVersions && Object.keys(itemBaseVersions).length) {
     items = {}
-    for (const itemUuid of Object.values(collectUnitUuids(entity.document))) {
+    const uuids = every ? Object.keys(itemBaseVersions) : Object.values(collectUnitUuids(entity.document))
+    for (const itemUuid of uuids) {
       const t = itemBaseVersions[itemUuid]
       if (t) items[itemUuid] = t
     }
@@ -215,8 +227,6 @@ function rewriteEntityAssets(node, map, ids, noStamp = null) {
  * @param {string} [opts.sourceLocale]    - localized-field wrap locale
  * @param {Object<string,string>} [opts.priorHashes] - sync-cache (send-only-changed)
  * @param {boolean} [opts.sendAll]        - bypass the prior-hash filter
- * @param {object[]} [opts.serviceRows]   - the `services` Section to send, as the
- *                                          caller decided it (site.js `requestedServices`)
  * @param {Object<string,string>} [opts.itemUuids] - unit path → backend `$uuid`,
  *        stamped onto the site-content document so the backend matches our items
  *        instead of re-minting them (which deletes and recreates every page and
@@ -225,11 +235,12 @@ function rewriteEntityAssets(node, map, ids, noStamp = null) {
  *        identity of its list items, as a previous push or pull banked it
  *        (`record-items.js`); stamped onto each record the backend holds, so a re-sent
  *        record updates its items instead of replacing them.
- * @param {Object<string,string>} [opts.itemBaseVersions] - record `$uuid` → opaque
- *        per-ITEM `version`. Narrowed at emit to the records the package carries and
- *        sent as `entries[].item_base_versions`, so the backend can refuse only the
- *        records that genuinely moved instead of the whole document. Omit to push
- *        those records unconditionally.
+ * @param {Object<string,string>} [opts.itemBaseVersions] - item `$uuid` → opaque
+ *        per-ITEM `version`, for every site-content item this copy has seen. Sent
+ *        whole on the site-content entity as `entries[].item_base_versions` — items
+ *        present and items the files dropped — so the backend refuses only the items
+ *        that genuinely moved, and deletes only what this copy saw (`withBaseVersion`).
+ *        Omit to push unconditionally.
  * @param {Object<string,string>} [opts.baseVersions] - backend-uuid → opaque
  *        `version` token, the push gate's optimistic-concurrency precondition.
  *        Each sent entity whose `$uuid` the map knows carries it as a top-level
@@ -292,6 +303,7 @@ export async function emitSyncPackages(siteRoot, opts = {}) {
   const priorHashes = opts.priorHashes || {}
   const sendAll = !!opts.sendAll
   const stamp = withBaseVersion(opts.baseVersions || {}, opts.itemBaseVersions || {})
+  const stampSite = withBaseVersion(opts.baseVersions || {}, opts.itemBaseVersions || {}, { every: true })
   const exporter = opts.exporter
   const exportedAt = opts.exportedAt
   refuseOrgOption(opts, 'emitSyncPackages')
@@ -376,13 +388,7 @@ export async function emitSyncPackages(siteRoot, opts = {}) {
         // and the page and `settings` keys that carry Open Graph texts per language.
         ...(Array.isArray(opts.queryFields) ? { queryFields: opts.queryFields } : {}),
         ...(Array.isArray(opts.pageFields) ? { pageFields: opts.pageFields } : {}),
-        ...(Array.isArray(opts.settingsFields) ? { settingsFields: opts.settingsFields } : {}),
-        // The `services` Section as the caller decided it — the site's rows with the
-        // owner's changed asks applied — or the Sections withheld. Passed through
-        // rather than decided here: the site's rows and the last agreement are what
-        // the CLI reads. See site.js at `requestedServices`.
-        ...(Array.isArray(opts.serviceRows) ? { serviceRows: opts.serviceRows } : {}),
-        ...(opts.declareServices === false ? { declareServices: false } : {})
+        ...(Array.isArray(opts.settingsFields) ? { settingsFields: opts.settingsFields } : {})
       })
     : null
   // Deploy-derived `info` fields are stamped here — NOT authored in site.yml, so they
@@ -584,7 +590,7 @@ export async function emitSyncPackages(siteRoot, opts = {}) {
   // --- site-content lane -------------------------------------------------------
   let siteContent = null
   if (siteEntity && changed(siteEntity)) {
-    siteContent = { ...emitLane([stamp(siteEntity)], exporter, exportedAt), index: [{ kind: 'site' }] }
+    siteContent = { ...emitLane([stampSite(siteEntity)], exporter, exportedAt), index: [{ kind: 'site' }] }
   }
 
   // The site's current uuid (from site.yml): the verb keys the folder push route on
@@ -636,5 +642,8 @@ export async function emitSyncPackages(siteRoot, opts = {}) {
     // records this package SENDS that the backend holds with list items and no bank entry
     // (their uuids) — sent as they are, the backend refuses each one (`identity_required`).
     recordItemIdentity,
+    // The queries whose records the site's pages show live — what the `records` service
+    // delivers on a published site (`shown-records.js`). Whether it changed or not.
+    recordsShown: siteDoc ? recordQueriesShown(siteDoc) : [],
   }
 }