@coraltravelcenter/b2c-landing-builder 2.6.0 → 2.6.2

package/npm-shrinkwrap.json

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

package/package.json

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

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}});
   }
 

package/src/deploy/images.mjs

@@ -8,6 +8,7 @@ function listFiles(root) {
   const files = [];
   const visit = (directory) => {
     for (const entry of fs.readdirSync(directory, {withFileTypes: true})) {
+      if (entry.name.startsWith(".")) continue;
       const absolutePath = path.join(directory, entry.name);
       if (entry.isDirectory()) visit(absolutePath);
       if (entry.isFile()) files.push(absolutePath);

package/src/deploy/manifest.mjs

@@ -17,6 +17,7 @@ function listFiles(root) {
   const files = [];
   const visit = (directory) => {
     for (const entry of fs.readdirSync(directory, {withFileTypes: true})) {
+      if (entry.name.startsWith(".")) continue;
       const absolutePath = path.join(directory, entry.name);
       if (entry.isDirectory()) visit(absolutePath);
       if (entry.isFile()) files.push(absolutePath);

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;