@bettercms-ai/convert 0.16.1 → 0.17.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @bettercms-ai/convert
 
+## 0.17.0
+
+### Minor Changes
+
+- 15ecfcb: `--forms` reads two new facts from the brief. `landmark` (where the built form sat: footer, header, nav, main, aside or dialog) breaks the tie between several source `<form>`s posting exactly a form's fields — a footer newsletter is not a "forgot password" dialog — and the choice is disclosed in `notes`. `pin` is the owner's answer from the Forms tab, applied like `--pin`; a flag typed at the keyboard still wins. `FORM_AMBIGUOUS` pending entries now carry `candidates`, the files a person picks from.
+
+### Patch Changes
+
+- c2cfcb7: `--forms` rewires a `<form>` that carries a stale `data-bcms-form` id — a repository re-imported after the project it was wired to was deleted. The attribute, the action and the success message are replaced in place (never doubled), existing field markers are kept, and the form counts as wired rather than already wired. Only a form carrying the brief form's own id is "already wired".
+- 994a5e6: `--forms` strips page-copy bindings (`data-bcms-field`, `data-bcms-kind`, `data-bcms-props`) declared on elements inside a `<form>` it wires. A form's labels, placeholders and button copy are the CMS form's, rendered by the section's `form` block; a hand conversion that bound them as page copy made the platform derive them beside the form and put the label on the section component twice. Copy around the form — the heading that names it — is untouched.
+
 ## 0.16.1
 
 ### Patch Changes

package/dist/cli.js

@@ -6377,6 +6377,7 @@ function scriptFor(dialect) {
 var messageFor = (dialect) => dialect === "jsx" ? `<p className="bcms-form-msg" hidden></p>` : `<p class="bcms-form-msg" hidden></p>`;
 var escapeAttr = (value) => value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/"/g, "&quot;");
 var attrOf = (el, name) => el.attrs.find((a) => a.name.toLowerCase() === name);
+var DECLARED_BINDING_ATTR = /^data-bcms-(field|kind|props)$/i;
 function* elementsIn(nodes) {
   for (const node of nodes) {
     if (node.type === "expr") {
@@ -6391,8 +6392,28 @@ function* elementsIn(nodes) {
 var childElements = (node) => node.children.flatMap(
   (child) => child.type === "element" ? [child] : child.type === "expr" ? childElements(child) : []
 );
+var LANDMARK_TAGS = /* @__PURE__ */ new Set(["footer", "header", "nav", "main", "aside", "dialog"]);
+function landmarkOf(chain) {
+  for (let i = chain.length - 1; i >= 0; i--) {
+    const el = chain[i];
+    if (attrOf(el, "role")?.value === "dialog") return "dialog";
+    if (LANDMARK_TAGS.has(el.tag.toLowerCase())) return el.tag.toLowerCase();
+  }
+  return "body";
+}
+function* formsIn(nodes, chain = []) {
+  for (const node of nodes) {
+    if (node.type === "expr") {
+      yield* formsIn(node.children, chain);
+      continue;
+    }
+    if (node.type !== "element") continue;
+    if (node.tag.toLowerCase() === "form") yield { el: node, landmark: landmarkOf(chain) };
+    yield* formsIn(node.children, [...chain, node]);
+  }
+}
 var isComponentTag = (dialect, tag) => dialect !== "html" && /^[A-Z]/.test(tag);
-function candidateOf(file, dialect, form, imported) {
+function candidateOf(file, dialect, form, imported, landmark) {
   const controls = /* @__PURE__ */ new Map();
   const wrapper = /* @__PURE__ */ new Map();
   const foreign = /* @__PURE__ */ new Set();
@@ -6429,7 +6450,7 @@ function candidateOf(file, dialect, form, imported) {
     const id = attrOf(control, "id")?.value;
     if (id && !controls.has(id)) controls.set(id, control);
   }
-  return { file, dialect, el: form, controls, wrapper, foreign };
+  return { file, dialect, el: form, controls, wrapper, foreign, landmark };
 }
 async function importedControls(source, parsed, dialect, project, cache) {
   const out = /* @__PURE__ */ new Map();
@@ -6464,14 +6485,21 @@ function wire(source, candidate, form) {
   };
   set("action", form.submitUrl);
   set("method", "post");
-  inserts.push(`data-bcms-form="${escapeAttr(form.id)}"`);
-  if (form.successMessage) inserts.push(`data-bcms-form-success="${escapeAttr(form.successMessage)}"`);
+  set("data-bcms-form", form.id);
+  if (form.successMessage) set("data-bcms-form-success", form.successMessage);
   source.appendLeft(el.attrInsertAt, ` ${inserts.join(" ")}`);
+  for (const inner of elementsIn(el.children)) {
+    for (const attr of inner.attrs) {
+      if (!DECLARED_BINDING_ATTR.test(attr.name)) continue;
+      const start = source.original[attr.range.start - 1] === " " ? attr.range.start - 1 : attr.range.start;
+      source.remove(start, attr.range.end);
+    }
+  }
   for (const field of form.fields) {
     const control = candidate.controls.get(field.key);
     if (candidate.foreign.has(control)) continue;
     const host = candidate.wrapper.get(control) ?? control;
-    source.appendLeft(host.attrInsertAt, ` data-bcms-form-field="${escapeAttr(field.key)}"`);
+    if (!attrOf(host, "data-bcms-form-field")) source.appendLeft(host.attrInsertAt, ` data-bcms-form-field="${escapeAttr(field.key)}"`);
     const name = attrOf(control, "name");
     if (!name) source.appendLeft(control.attrInsertAt, ` name="${escapeAttr(field.key)}"`);
     else if (!name.expression && name.value !== field.key && name.valueRange) {
@@ -6515,8 +6543,8 @@ async function wireForms(briefIn, sources, options_ = {}) {
       continue;
     }
     const imported = dialect === "html" ? /* @__PURE__ */ new Map() : await importedControls(source, parsed, dialect, project, componentFiles);
-    for (const el of elementsIn(parsed.roots)) {
-      if (el.tag.toLowerCase() === "form") candidates.push(candidateOf(source.path, dialect, el, imported));
+    for (const { el, landmark } of formsIn(parsed.roots)) {
+      candidates.push(candidateOf(source.path, dialect, el, imported, landmark));
     }
   }
   const holds = (c, f) => f.fields.filter((field) => c.controls.has(field.key)).length;
@@ -6530,6 +6558,9 @@ async function wireForms(briefIn, sources, options_ = {}) {
     if (file.trim() === "") throw new Error(`--pin ${ref}: no file named. Give "<form>=<file>".`);
     pinned.set(form.id, file);
   }
+  for (const form of forms) {
+    if (form.pin && form.pin.trim() !== "" && !pinned.has(form.id)) pinned.set(form.id, form.pin);
+  }
   for (const [id, file] of pinned) {
     options.set(id, options.get(id).filter((c) => samePath(c.file, file)));
     for (const other of forms) {
@@ -6549,6 +6580,15 @@ async function wireForms(briefIn, sources, options_ = {}) {
     for (const f of rivals) options.set(f.id, options.get(f.id).filter((x) => x !== c));
     beat.set(c, { winner: winners[0], rivals });
   }
+  const placed = /* @__PURE__ */ new Map();
+  for (const form of forms) {
+    const list = options.get(form.id);
+    if (list.length < 2 || !form.landmark || form.landmark === "body") continue;
+    const kept = list.filter((c) => c.landmark === form.landmark);
+    if (kept.length === 0 || kept.length === list.length) continue;
+    options.set(form.id, kept);
+    placed.set(form.id, { kept, dropped: list.filter((c) => !kept.includes(c)) });
+  }
   const wanted = /* @__PURE__ */ new Map();
   for (const list of options.values()) for (const c of list) wanted.set(c, (wanted.get(c) ?? 0) + 1);
   const matched = [];
@@ -6559,12 +6599,13 @@ async function wireForms(briefIn, sources, options_ = {}) {
   for (const form of forms) {
     const list = options.get(form.id) ?? [];
     if (list.length > 1) {
-      pend2(
-        form,
-        "FORM_AMBIGUOUS",
-        void 0,
-        `${list.length} forms post every field of "${form.name}": ${list.map((c) => c.file).join(", ")}.${pinned.has(form.id) ? " The pin names that file, and it holds more than one." : ` Name the right one with --pin "${form.name}=<file>".`}`
-      );
+      pending.push({
+        id: form.id,
+        name: form.name,
+        reason: "FORM_AMBIGUOUS",
+        message: `${list.length} forms post every field of "${form.name}": ${list.map((c) => c.file).join(", ")}.${pinned.has(form.id) ? " The pin names that file, and it holds more than one." : ` Name the right one with --pin "${form.name}=<file>".`}`,
+        candidates: [...new Set(list.map((c) => c.file))]
+      });
       continue;
     }
     if (list.length === 1 && (wanted.get(list[0]) ?? 0) > 1) {
@@ -6602,7 +6643,7 @@ async function wireForms(briefIn, sources, options_ = {}) {
       pend2(form, "FIELD_UNMATCHED", candidate.file, `the control for ${misnamed.key} posts under an expression, so its name cannot be set to the CMS key.`);
       continue;
     }
-    if (attrOf(candidate.el, "data-bcms-form")) {
+    if (attrOf(candidate.el, "data-bcms-form")?.value === form.id) {
       alreadyWired++;
       onSite.push({ form, file: candidate.file });
       continue;
@@ -6634,6 +6675,12 @@ ${indent}${scriptFor(last.candidate.dialect)}`);
         `form ${form.name}: ${candidate.file} posts every field of ${tie.rivals.map((f) => f.name).join(", ")} too, and more of ${form.name}'s, so it went to ${form.name} \u2014 name the file yourself with --pin "<form>=<file>" if that is wrong.`
       );
     }
+    const where = placed.get(form.id);
+    if (where) {
+      notes.push(
+        `form ${form.name}: ${where.dropped.map((c) => c.file).join(", ")} post${where.dropped.length === 1 ? "s" : ""} every field of it too, but the built form sat in the ${form.landmark} and only ${candidate.file}'s does \u2014 name the file yourself with --pin "<form>=<file>" if that is wrong.`
+      );
+    }
   }
   for (const { form, candidate } of matched) {
     const keys = form.fields.filter((field) => candidate.foreign.has(candidate.controls.get(field.key))).map((field) => field.key);
@@ -9735,7 +9782,7 @@ function emitStubs2(dialects, slugs, contents, out) {
 // package.json
 var package_default = {
   name: "@bettercms-ai/convert",
-  version: "0.16.1",
+  version: "0.17.0",
   type: "module",
   description: "Deterministic codemod that turns an imported site's text-matched bindings into declared ones \u2014 parser offsets in, one magic-string pass out, plus a receipt of everything it could not do.",
   bin: {