@coraltravelcenter/b2c-landing-builder 2.9.0 → 2.10.1

package/README.md

@@ -26,6 +26,9 @@ b2c-landing-vite deploy --dry-run
 b2c-landing-vite deploy --update
 b2c-landing-vite deploy --relink
 b2c-landing-vite deploy --publish
+b2c-landing-vite deploy --section hero
+b2c-landing-vite deploy --remote
+b2c-landing-vite deploy --force
 b2c-landing-vite deploy --assets-only
 b2c-landing-vite deploy --assets-only --prune-assets
 b2c-landing-vite block:add hero
@@ -52,6 +55,20 @@ b2c-landing-vite update
   Страница, виджеты, ассеты и локальный deploy-state при этом не изменяются.
 - `deploy --assets-only --dry-run` показывает только план синхронизации ассетов.
 - `deploy --update` обновляет сохранённую версию страницы без создания новой.
+- `deploy --section <key>` меняет только блок с ключом из `order.json`. Builder
+  берёт за основу актуальную remote-страницу, поэтому локальные копии соседних
+  секций не попадают в payload и не могут затереть изменения из CMS.
+- После успешного deploy builder сохраняет снимок секций в `.b2c/deploy/` как
+  достоверный `base`. Следующий deploy структурно сравнивает секции `local`,
+  актуальный `remote` и `base`. Изменения разных секций объединяются; изменение
+  одной секции с обеих сторон считается конфликтом.
+- Если `base` ещё отсутствует, отличие local от remote считается потенциальным
+  конфликтом. Обычный deploy не выполняет silent overwrite и предлагает явно
+  сохранить CMS-версию, применить local или отменить операцию.
+- `deploy --remote` не перезаписывает конфликтующие секции локальной версией.
+  `deploy --force` осознанно выбирает local. Для section deploy обе стратегии
+  ограничены выбранной секцией: `deploy --section hero --remote` или
+  `deploy --section hero --force`; соседние remote-секции сохраняются.
 - `deploy --relink` восстанавливает или меняет привязку проекта к существующей
   CMS-странице. Builder предлагает application, поиск страницы по названию или
   URL, версию, HTML-зону и точную позицию. Обычный запуск создаёт checkout для
@@ -72,6 +89,8 @@ b2c-landing-vite update
   `deploy --relink`.
 - Одновременные deploy одного проекта на компьютере блокируются lock-файлом в
   `.b2c/deploy/`; аварийно оставленный lock автоматически признаётся устаревшим.
+- Непосредственно перед первой записью CMS-состояние читается повторно. Если оно
+  изменилось во время проверки/выбора стратегии, deploy останавливается.
 - `block:add` создаёт файлы в выбранных форматах разметки и стилей.
 - `block:rename` атомарно переименовывает все файлы блока и обновляет порядок.
 - `update` проверяет npm registry и показывает команду ручного обновления.
@@ -105,7 +124,7 @@ npm create @coraltravelcenter/b2c-landing-vite
 export default {
   schemaVersion: 2,
   builder: {
-    minVersion: "2.5.0",
+    minVersion: "2.10.0",
   },
   project: {
     name: "uae-promo",
@@ -162,6 +181,7 @@ src/
     welcome.css | welcome.scss | welcome.less
   scripts/
     welcome.js | welcome.ts
+    utils/          # общие JavaScript-утилиты проекта
   components/       # только для Vue
 public/
 pug.rc               # только для Pug

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@coraltravelcenter/b2c-landing-builder",
-  "version": "2.9.0",
+  "version": "2.10.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@coraltravelcenter/b2c-landing-builder",
-      "version": "2.9.0",
+      "version": "2.10.1",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "7.28.6",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coraltravelcenter/b2c-landing-builder",
-  "version": "2.9.0",
+  "version": "2.10.1",
   "description": "CLI and build toolkit for B2C landing projects",
   "type": "module",
   "bin": {

package/src/cli/index.mjs

@@ -12,6 +12,9 @@ Commands:
   deploy --update           Update the current CMS version in place
   deploy --relink           Attach the project to an existing CMS page
   deploy --publish          Publish after a successful deploy
+  deploy --section <key>    Deploy one section, preserving all other remote sections
+  deploy --force            Explicitly overwrite remote changes in the current scope
+  deploy --remote           Keep remote content when changes conflict
   deploy --assets-only --prune-assets
                             Remove obsolete project assets recorded in deploy-state
   deploy --assets-only      Build and sync assets with the B2C CDN
@@ -82,13 +85,17 @@ export async function runCli(args) {
     return;
   }
   if (command === "deploy") {
-    const allowed = new Set(["--assets-only", "--update", "--dry-run", "--relink", "--publish", "--prune-assets"]);
-    const flags = new Set(rest);
-    if (rest.some((argument) => !allowed.has(argument)) || flags.size !== rest.length ||
+    const allowed = new Set(["--assets-only", "--update", "--dry-run", "--relink", "--publish", "--prune-assets", "--force", "--remote"]);
+    const flags = new Set(rest.filter((argument) => allowed.has(argument)));
+    const sectionIndex = rest.indexOf("--section");
+    const section = sectionIndex >= 0 ? rest[sectionIndex + 1] : null;
+    const consumed = new Set([...flags, ...(sectionIndex >= 0 ? ["--section", section] : [])]);
+    if (rest.some((argument) => !consumed.has(argument)) || (sectionIndex >= 0 && !section) ||
+      (flags.has("--force") && flags.has("--remote")) ||
       (flags.has("--assets-only") && (flags.has("--update") || flags.has("--relink") || flags.has("--publish"))) ||
       (flags.has("--prune-assets") && !flags.has("--assets-only"))) {
       throw new Error(
-        "Usage: b2c-landing-vite deploy [--assets-only | --update] [--relink] [--publish] [--prune-assets] [--dry-run]"
+        "Usage: b2c-landing-vite deploy [--section <key>] [--force | --remote] [--update] [--relink] [--publish] [--dry-run]"
       );
     }
     const config = await loadConfig();
@@ -126,6 +133,8 @@ export async function runCli(args) {
         relink: flags.has("--relink"),
         publish: flags.has("--publish"),
         pruneAssets: flags.has("--prune-assets"),
+        section,
+        strategy: flags.has("--force") ? "force" : flags.has("--remote") ? "remote" : "ask",
       });
     });
   }

package/src/deploy/deploy.mjs

@@ -2,6 +2,7 @@ import {planAssetChanges, uploadChangedAssets} from "./assets.mjs";
 import {BackofficeClient} from "./backoffice-client.mjs";
 import {readBuildManifest} from "./manifest.mjs";
 import {readDeploymentState, writeDeploymentState} from "./state.mjs";
+import {resolveSections, summarizeChanges} from "./reconcile.mjs";
 import {
   createPagePlacement,
   prepareExistingPage,
@@ -12,7 +13,7 @@ import {
   selectNewPagePlacement,
   validateSavedPlacement,
 } from "./page.mjs";
-import {planWidgetChanges, syncWidgets} from "./widgets.mjs";
+import {localSections, planWidgetChanges, remoteSections, syncWidgets} from "./widgets.mjs";
 
 function paths(items) {
   return items.map((item) => item.path);
@@ -139,6 +140,8 @@ export async function deployProject({
   pruneAssets = false,
   publish = false,
   prompts,
+  section,
+  strategy = "ask",
   log = console.log,
 }) {
   const manifest = readBuildManifest(root);
@@ -149,6 +152,7 @@ export async function deployProject({
     ? "[deploy] validating saved CMS placement..."
     : relink ? "[deploy] selecting an existing CMS page..." : "[deploy] a new CMS page will be created");
   let selectedPage = null;
+  let remoteBefore = null;
   if (relink) selectedPage = await selectExistingPagePlacement({client: api, domain: preset.domain, prompts});
   else if (previous.placement) {
     selectedPage = {
@@ -156,6 +160,53 @@ export async function deployProject({
       pageContent: await validateSavedPlacement({client: api, placement: previous.placement}),
     };
   }
+  const availableSections = manifest.blocks.map((block) => block.path.replace(/\.html$/, ""));
+  if (section && !availableSections.includes(section)) {
+    throw new Error(`Section ${JSON.stringify(section)} not found. Available sections: ${availableSections.join(", ") || "none"}`);
+  }
+  let reconciliation = null;
+  if (selectedPage) {
+    log(`[deploy] scope: ${section ? `section ${JSON.stringify(section)}` : "page"}`);
+    const local = localSections(manifest, root);
+    const remote = remoteSections(selectedPage.pageContent, selectedPage.placement, manifest.folder);
+    remoteBefore = remote;
+    const base = previous.cms?.sections || null;
+    let chosen = strategy;
+    reconciliation = resolveSections({local, remote, base, scope: section ? [section] : undefined, strategy: chosen === "ask" ? "merge" : chosen});
+    if (reconciliation.changes.length) {
+      const summary = summarizeChanges(reconciliation.changes);
+      for (const [kind, ids] of Object.entries(summary)) if (ids.length) log(`[deploy] ${kind}: ${ids.join(", ")}`);
+    }
+    if (reconciliation.unsafe.length && chosen === "ask") {
+      prompts ||= await (async () => {
+        const {isCancel, select} = await import("@clack/prompts");
+        return {select: async (options) => {
+          const value = await select(options);
+          if (isCancel(value)) throw new Error("Deploy cancelled");
+          return value;
+        }};
+      })();
+      chosen = await prompts.select({
+        message: "Remote CMS changes detected",
+        options: [
+          {label: "Keep remote changes", value: "remote"},
+          {label: `Overwrite ${section ? "this section" : "the page"} with local changes`, value: "force"},
+          {label: "Cancel deploy", value: "cancel"},
+        ],
+      });
+      if (chosen === "cancel") throw new Error("Deploy cancelled; CMS was not modified");
+      reconciliation = resolveSections({local, remote, base, scope: section ? [section] : undefined, strategy: chosen});
+    } else if (reconciliation.unsafe.length) {
+      throw new Error(`Deploy stopped: remote changes require --force or --remote (${reconciliation.unsafe.map((item) => item.id).join(", ")})`);
+    }
+  }
+  // No remote mutation happens until the page state and the user's resolution are known.
+  if (selectedPage) {
+    const verified = await validateSavedPlacement({client: api, placement: selectedPage.placement});
+    if (pageRevision(verified) !== pageRevision(selectedPage.pageContent)) {
+      throw new Error("CMS page changed during deploy. Nothing was modified; run deploy again.");
+    }
+  }
   log("[deploy] synchronizing CDN assets...");
   const assets = await uploadChangedAssets({
     manifest,
@@ -180,11 +231,18 @@ export async function deployProject({
     placement: page.placement,
     pageContent: page.pageContent,
     root,
+    sectionIds: reconciliation ? [...new Set([
+      ...Object.keys(remoteBefore || {}),
+      ...Object.keys(reconciliation.sections || {}),
+    ])].filter((id) => reconciliation.sections?.[id] !== remoteBefore?.[id]) : null,
   });
   const state = {
     ...assets.state,
     placement: page.placement,
-    cms: {verifiedAt: new Date().toISOString()},
+    cms: {
+      verifiedAt: new Date().toISOString(),
+      sections: remoteSections(await api.getContent(page.placement.pageContentId), page.placement, manifest.folder),
+    },
   };
   let published = false;
   let finalPageContent = await api.getContent(page.placement.pageContentId);

package/src/deploy/page.mjs

@@ -255,6 +255,7 @@ export function pageRevision(pageContent) {
       area: widget.layoutAreaId,
       order: widget.order,
       title: widget.cmsTitle,
+      content: widget.data?.content ?? widget.content ?? null,
     })),
   });
 }

package/src/deploy/reconcile.mjs

@@ -0,0 +1,47 @@
+export function compareSections({local, remote, base}) {
+  const ids = [...new Set([...Object.keys(local), ...Object.keys(remote), ...Object.keys(base || {})])].sort();
+  const changes = [];
+  for (const id of ids) {
+    const localValue = local[id];
+    const remoteValue = remote[id];
+    const baseValue = base?.[id];
+    if (localValue === remoteValue) continue;
+    if (!base) {
+      changes.push({id, kind: "unknown", local: localValue, remote: remoteValue});
+    } else if (remoteValue === baseValue) {
+      changes.push({id, kind: "local", local: localValue, remote: remoteValue});
+    } else if (localValue === baseValue) {
+      changes.push({id, kind: "remote", local: localValue, remote: remoteValue});
+    } else {
+      changes.push({id, kind: "conflict", local: localValue, remote: remoteValue});
+    }
+  }
+  return changes;
+}
+
+export function summarizeChanges(changes) {
+  return Object.fromEntries(["local", "remote", "conflict", "unknown"].map((kind) => [
+    kind,
+    changes.filter((change) => change.kind === kind).map((change) => change.id),
+  ]));
+}
+
+export function resolveSections({local, remote, base, scope, strategy = "merge"}) {
+  const selected = scope?.length ? new Set(scope) : new Set(Object.keys(local));
+  const scopedLocal = Object.fromEntries(Object.entries(local).filter(([id]) => selected.has(id)));
+  const scopedRemote = Object.fromEntries(Object.entries(remote).filter(([id]) => selected.has(id)));
+  const scopedBase = base && Object.fromEntries(Object.entries(base).filter(([id]) => selected.has(id)));
+  const changes = compareSections({local: scopedLocal, remote: scopedRemote, base: scopedBase});
+  const unsafe = changes.filter((change) => change.kind === "conflict" || change.kind === "unknown");
+  if (strategy === "merge" && unsafe.length) return {changes, unsafe, sections: null};
+  const sections = {...remote};
+  for (const id of selected) {
+    const change = changes.find((item) => item.id === id);
+    if (strategy === "remote" && change) continue;
+    if (strategy === "force" || !change || change.kind === "local") {
+      if (local[id] === undefined) delete sections[id];
+      else sections[id] = local[id];
+    }
+  }
+  return {changes, unsafe: [], sections};
+}

package/src/deploy/widgets.mjs

@@ -14,6 +14,12 @@ export function readDeployBundles(manifest, root = process.cwd()) {
   }));
 }
 
+export function localSections(manifest, root = process.cwd()) {
+  return Object.fromEntries(readDeployBundles(manifest, root).map((bundle) => [
+    bundle.title.slice(bundle.title.lastIndexOf(" | ") + 3), bundle.source,
+  ]));
+}
+
 function widgetsForPlacement(pageContent, layoutAreaId, folder) {
   const widgets = pageContent.pageContents
     ?.find((content) => String(content.languageId) === RU_LANGUAGE_ID)?.widgets || [];
@@ -23,6 +29,12 @@ function widgetsForPlacement(pageContent, layoutAreaId, folder) {
   );
 }
 
+export function remoteSections(pageContent, placement, folder) {
+  return Object.fromEntries(widgetsForPlacement(pageContent || {}, placement.layoutAreaId, folder).map((widget) => [
+    widget.cmsTitle.slice(widget.cmsTitle.lastIndexOf(" | ") + 3), widget.data?.content ?? widget.content ?? "",
+  ]));
+}
+
 export function planWidgetChanges({manifest, placement, pageContent, root = process.cwd()}) {
   const bundles = readDeployBundles(manifest, root);
   const existing = widgetsForPlacement(pageContent || {}, placement.layoutAreaId, manifest.folder);
@@ -41,15 +53,20 @@ export function planWidgetChanges({manifest, placement, pageContent, root = proc
   };
 }
 
-export async function syncWidgets({client, manifest, placement, pageContent, root = process.cwd()}) {
+export async function syncWidgets({client, manifest, placement, pageContent, root = process.cwd(), sectionIds = null}) {
   const bundles = readDeployBundles(manifest, root);
+  const selected = sectionIds && new Set(sectionIds);
+  const scopedBundles = selected
+    ? bundles.filter((bundle) => selected.has(bundle.title.slice(bundle.title.lastIndexOf(" | ") + 3)))
+    : bundles;
   const existing = widgetsForPlacement(pageContent, placement.layoutAreaId, manifest.folder);
   const activeIds = new Set();
   let added = 0;
   let updated = 0;
   let reordered = 0;
 
-  for (const [index, bundle] of bundles.entries()) {
+  for (const bundle of scopedBundles) {
+    const index = bundles.indexOf(bundle);
     let widget = existing.find((candidate) => candidate.cmsTitle === bundle.title);
     if (widget) {
       await client.updateWidget(bundle.title, widget.contentWidgetId, bundle.source);
@@ -77,6 +94,8 @@ export async function syncWidgets({client, manifest, placement, pageContent, roo
 
   let removed = 0;
   for (const widget of existing) {
+    const id = widget.cmsTitle.slice(widget.cmsTitle.lastIndexOf(" | ") + 3);
+    if (selected && !selected.has(id)) continue;
     if (activeIds.has(widget.contentWidgetId)) continue;
     await client.removeWidget({
       contentWidgetId: widget.contentWidgetId,