@coraltravelcenter/b2c-landing-builder 2.6.1 → 2.6.3

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@coraltravelcenter/b2c-landing-builder",
-  "version": "2.6.1",
+  "version": "2.6.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@coraltravelcenter/b2c-landing-builder",
-      "version": "2.6.1",
+      "version": "2.6.3",
       "license": "MIT",
       "dependencies": {
         "@clack/prompts": "1.7.0",

package/package.json

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

package/src/deploy/assets.mjs

@@ -9,19 +9,40 @@ export async function uploadChangedAssets({
   state,
   root = process.cwd(),
   uploadFile,
+  listFiles,
   remoteRoot = "/content",
   concurrency = 5,
 }) {
   const pending = changedAssets(manifest, state);
   const assets = {...state.assets};
   const uploaded = [];
+  const skipped = [];
+  const remoteDirectories = new Map();
   let cursor = 0;
 
+  const namesInRemoteDirectory = (remoteDirectory) => {
+    if (!remoteDirectories.has(remoteDirectory)) {
+      remoteDirectories.set(remoteDirectory, Promise.resolve(listFiles(remoteDirectory)).then((listing) => {
+        const files = Array.isArray(listing) ? listing : listing?.files || [];
+        return new Set(files.map((file) => typeof file === "string" ? path.posix.basename(file) : file.name));
+      }));
+    }
+    return remoteDirectories.get(remoteDirectory);
+  };
+
   async function worker() {
     while (cursor < pending.length) {
       const asset = pending[cursor++];
       const localPath = path.join(root, ...(manifest.assetsDirectory || "public").split("/"), ...asset.path.split("/"));
       const remotePath = path.posix.join("/", remoteRoot, manifest.assetsPrefix, asset.path);
+      if (listFiles) {
+        const names = await namesInRemoteDirectory(path.posix.dirname(remotePath));
+        if (names.has(path.posix.basename(remotePath))) {
+          assets[asset.path] = {...asset, immutable: true};
+          skipped.push(asset.path);
+          continue;
+        }
+      }
       const result = await uploadFile(remotePath, localPath);
       assets[asset.path] = {...asset, url: result?.files?.[0]?.url};
       uploaded.push(asset.path);
@@ -33,6 +54,7 @@ export async function uploadChangedAssets({
   return {
     state: {...state, assets},
     uploaded: uploaded.sort(),
+    skipped: skipped.sort(),
     unchanged: manifest.assets.length - pending.length,
   };
 }

package/src/deploy/backoffice-client.mjs

@@ -90,6 +90,9 @@ export class BackofficeClient {
   }
 
   reorderWidget(contentWidgetId, order) {
+    if (!Number.isInteger(order) || order < 1) {
+      throw new Error(`Widget order must be a positive integer, received: ${order}`);
+    }
     return this.request("PUT", "/Content/Widget/ChangeOrder", {body: {contentWidgetId, order}});
   }
 
@@ -97,10 +100,17 @@ export class BackofficeClient {
     return this.request("PUT", "/Content/UpdateDocumentStatus", {body: {pageContentId, documentStatus}});
   }
 
+  async listFiles(remoteDirectory) {
+    const result = await this.request("GET", "/FileManagement/ListFiles", {
+      query: {path: remoteDirectory.replace(/^\/+/, "")},
+    });
+    return result?.result || result;
+  }
+
   async uploadFile(remotePath, localPath) {
     const parsed = path.posix.parse(remotePath);
     const form = new FormData();
-    form.append("Body.OverWrite", "true");
+    form.append("Body.OverWrite", "false");
     form.append("Body.Path", parsed.dir.replace(/^\/+/, ""));
     form.append("Body.Files", new Blob([fs.readFileSync(localPath)]), parsed.base);
     const result = await this.request("POST", "/FileManagement/UploadFile", {form});

package/src/deploy/deploy.mjs

@@ -30,9 +30,13 @@ export async function deployAssetsOnly({
     root,
     remoteRoot: new URL(preset.assetsBase).pathname,
     uploadFile: api.uploadFile.bind(api),
+    listFiles: api.listFiles?.bind(api),
   });
   writeDeploymentState(preset.id, manifest.folder, result.state, root);
-  log(`[deploy] assets: uploaded=${result.uploaded.length}, unchanged=${result.unchanged}`);
+  log(`[deploy] assets: uploaded=${result.uploaded.length}, skipped=${result.skipped.length}, unchanged=${result.unchanged}`);
+  if (result.skipped.length) {
+    log(`[deploy] existing assets were not overwritten: ${result.skipped.join(", ")}. Rename changed files to publish new URLs.`);
+  }
   return {...result, target: String(cdnUrl)};
 }
 
@@ -56,6 +60,7 @@ export async function deployProject({
     root,
     remoteRoot: new URL(preset.assetsBase).pathname,
     uploadFile: api.uploadFile.bind(api),
+    listFiles: api.listFiles?.bind(api),
   });
   const page = previous.placement
     ? await prepareExistingPage({client: api, placement: previous.placement, update})
@@ -72,7 +77,10 @@ export async function deployProject({
   const preview = page.pageContent.uniqueId
     ? `https://${preset.domain}/preview/${page.pageContent.uniqueId}/`
     : null;
-  log(`[deploy] assets: uploaded=${assets.uploaded.length}, unchanged=${assets.unchanged}`);
+  log(`[deploy] assets: uploaded=${assets.uploaded.length}, skipped=${assets.skipped.length}, unchanged=${assets.unchanged}`);
+  if (assets.skipped.length) {
+    log(`[deploy] existing assets were not overwritten: ${assets.skipped.join(", ")}. Rename changed files to publish new URLs.`);
+  }
   log(`[deploy] widgets: added=${widgets.added}, updated=${widgets.updated}, removed=${widgets.removed}`);
   if (preview) log(`[deploy] preview: ${preview}`);
   return {assets, widgets, placement: page.placement, preview};

package/src/deploy/page.mjs

@@ -1,11 +1,29 @@
 import {HTML_WIDGET_ID, STATUS} from "./backoffice-client.mjs";
 
 function suitableAreas(scheme) {
-  return scheme.flatMap((row) => row.children || []).filter((column) =>
-    column.usableWidgets?.some((widget) => widget.widgetId === HTML_WIDGET_ID)
+  return scheme.flatMap((row, rowIndex) => (row.children || []).map((column, columnIndex) => ({
+    area: column,
+    rowIndex,
+    columnIndex,
+  }))).filter(({area}) =>
+    area.usableWidgets?.some((widget) => widget.widgetId === HTML_WIDGET_ID)
   );
 }
 
+function widgetNames(area) {
+  return (area.usedWidgets || []).map((widget, index) =>
+    widget.widgetName || widget.cmsTitle || widget.name || `widget ${index + 1}`
+  );
+}
+
+function areaLabel({area, rowIndex, columnIndex}) {
+  const name = area.name || area.title || "HTML area";
+  const width = area.breakPoint?.xxl ? `, width ${area.breakPoint.xxl}/12` : "";
+  const contents = widgetNames(area);
+  const summary = contents.length ? contents.join(" → ") : "empty";
+  return `Row ${rowIndex + 1}, column ${columnIndex + 1}${width}: ${name} — ${summary}`;
+}
+
 async function defaultPrompts() {
   const {isCancel, select, text} = await import("@clack/prompts");
   const answer = async (promise) => {
@@ -51,19 +69,23 @@ export async function createPagePlacement({client, manifest, prompts}) {
   });
   const selected = choices.find(({layout}) => layout.layoutId === layoutId);
   const layoutAreaId = await prompts.select({
-    message: "HTML widget area",
-    options: selected.areas.map((area, index) => ({
-      label: area.name || area.title || `Area ${index + 1}`,
-      value: area.layoutAreaId || area.id,
+    message: "Where on the layout should the landing blocks go?",
+    options: selected.areas.map((descriptor) => ({
+      label: areaLabel(descriptor),
+      value: descriptor.area.layoutAreaId || descriptor.area.id,
     })),
   });
-  const area = selected.areas.find((candidate) => (candidate.layoutAreaId || candidate.id) === layoutAreaId);
-  const count = area.usedWidgets?.length || 0;
+  const area = selected.areas.find(({area: candidate}) =>
+    (candidate.layoutAreaId || candidate.id) === layoutAreaId
+  ).area;
+  const names = widgetNames(area);
   const orderIndex = await prompts.select({
-    message: "Insert blocks after position",
-    options: Array.from({length: count + 1}, (_, index) => ({
-      label: index === 0 ? "At the beginning" : `After widget ${index}`,
-      value: index - 1,
+    message: "Exact insertion point",
+    options: Array.from({length: names.length + 1}, (_, index) => ({
+      label: index === 0
+        ? names.length ? `At the beginning, before “${names[0]}”` : "Into the empty area"
+        : `After “${names[index - 1]}”`,
+      value: index,
     })),
   });
   const created = await client.createPage({applicationId, layoutId, name: pageName.trim()});

package/src/deploy/widgets.mjs

@@ -50,7 +50,7 @@ export async function syncWidgets({client, manifest, placement, pageContent, roo
       added += 1;
     }
     activeIds.add(widget.contentWidgetId);
-    const desiredOrder = placement.orderIndex + 1 + index;
+    const desiredOrder = Math.max(0, placement.orderIndex) + 1 + index;
     if (widget.order !== desiredOrder) {
       await client.reorderWidget(widget.contentWidgetId, desiredOrder);
       reordered += 1;