@bettercms-ai/convert 0.16.0 → 0.17.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @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
+
+- Fix `--forms` tie-breaking. 0.16.0's second tie-break rule ("the form posting nothing beyond its
+  fields wins") could bind a look-alike form — for example a "forgot password" dialog posting only
+  `email` — to the newsletter without reporting it. 0.16.1 removes that rule: such cases stay
+  `FORM_AMBIGUOUS` until you name the file with `--pin "<form>=<file>"`. When the remaining rule
+  (the form posting more of a `<form>`'s fields wins) decides a tie, the receipt now carries a `notes`
+  line naming the file and the rival that lost it. `--pin` is also stricter: an empty value or a
+  repeated pin for the same form is refused, `--pin` cannot be combined with `--componentize`, and
+  two forms pinned to one file both wire.
+
 ## 0.16.0
 
 ### Minor Changes

package/README.md

@@ -630,6 +630,13 @@ a reason — `FORM_NOT_IN_SOURCE`, `FORM_AMBIGUOUS`, `FIELD_UNMATCHED`, `ACTION_
 leads into another form's inbox, silently, forever. A `<form>` that already carries
 `data-bcms-form` is `alreadyWired` and is left alone, so a second run is a no-op.
 
+Two `<form>`s that both post exactly a form's fields are `FORM_AMBIGUOUS`, and no rule can break
+that tie: `--pin "<form>=<file>"` (repeatable, form by id or name) names the file, and a pin is
+exclusive only against forms that carry no pin of their own, so two forms living in one file can
+both be pinned to it. **Keep passing a pin on every later run** — a pin is not written into the
+tree, so an unpinned run over the same repository reports that form ambiguous again and its
+receipt stops listing the file it is wired to, even though the markup still is.
+
 `--receipt <file>` writes this run's own receipt (`forms-receipt.json` — a separate file from the
 P2 run's, since the two runs describe different work), and `--strict` exits 2 on any pending form.
 `--forms` and `--componentize` are separate runs; doing both in one command is refused.

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,38 +6543,51 @@ 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;
   const covers2 = (c, f) => f.fields.length > 0 && holds(c, f) === f.fields.length;
-  const posts = (c) => new Set(c.controls.values()).size;
   const samePath = (a, b) => a.replace(/\\/g, "/").replace(/^\.\//, "") === b.replace(/\\/g, "/").replace(/^\.\//, "");
   const options = new Map(forms.map((f) => [f.id, candidates.filter((c) => covers2(c, f))]));
   const pinned = /* @__PURE__ */ new Map();
   for (const [ref, file] of Object.entries(options_.pins ?? {})) {
     const form = forms.find((f) => f.id === ref || f.name === ref);
     if (!form) throw new Error(`--pin ${ref}: the brief lists no form with that id or name.`);
+    if (file.trim() === "") throw new Error(`--pin ${ref}: no file named. Give "<form>=<file>".`);
     pinned.set(form.id, file);
-    options.set(form.id, options.get(form.id).filter((c) => samePath(c.file, 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) {
-      if (other.id !== form.id) options.set(other.id, options.get(other.id).filter((c) => !samePath(c.file, file)));
+      const its = pinned.get(other.id);
+      if (other.id === id || its !== void 0 && samePath(its, file)) continue;
+      options.set(other.id, options.get(other.id).filter((c) => !samePath(c.file, file)));
     }
   }
+  const beat = /* @__PURE__ */ new Map();
   for (const c of candidates) {
     const claimants = forms.filter((f) => options.get(f.id).includes(c));
     if (claimants.length < 2) continue;
     const top = Math.max(...claimants.map((f) => holds(c, f)));
     const winners = claimants.filter((f) => holds(c, f) === top);
     if (winners.length !== 1) continue;
-    for (const f of claimants) if (f !== winners[0]) options.set(f.id, options.get(f.id).filter((x) => x !== c));
+    const rivals = claimants.filter((f) => f !== winners[0]);
+    for (const f of rivals) options.set(f.id, options.get(f.id).filter((x) => x !== c));
+    beat.set(c, { winner: winners[0], rivals });
   }
-  for (const f of forms) {
-    const list = options.get(f.id);
-    if (list.length < 2) continue;
-    const exact = list.filter((c) => posts(c) === f.fields.length);
-    if (exact.length === 1) options.set(f.id, exact);
+  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);
@@ -6558,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(", ")}. 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) {
@@ -6601,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;
@@ -6626,6 +6668,20 @@ ${indent}${scriptFor(last.candidate.dialect)}`);
     files.push({ path, operation: "modify", content: source.toString() });
   }
   const notes = onSite.filter(({ form }) => form.status === "draft").map(({ form }) => `publish form ${form.name} in the Forms tab \u2014 a draft form rejects every submission with 403.`);
+  for (const { form, candidate } of matched) {
+    const tie = beat.get(candidate);
+    if (tie?.winner === form) {
+      notes.push(
+        `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);
     if (keys.length > 0) {
@@ -9726,7 +9782,7 @@ function emitStubs2(dialects, slugs, contents, out) {
 // package.json
 var package_default = {
   name: "@bettercms-ai/convert",
-  version: "0.16.0",
+  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: {
@@ -9805,9 +9861,14 @@ function parseArgs(argv) {
     else if (arg === "--componentize") args.componentize = true;
     else if (arg === "--forms") args.forms = true;
     else if (arg === "--pin") {
-      const at = (argv[++i] ?? "").indexOf("=");
-      if (at < 1) throw new CliError(`--pin takes <form>=<file>, e.g. --pin "Newsletter=src/components/FooterSection.astro". See --help.`);
-      args.pins[argv[i].slice(0, at)] = argv[i].slice(at + 1);
+      const raw = argv[++i] ?? "";
+      const at = raw.indexOf("=");
+      if (at < 1 || at === raw.length - 1) {
+        throw new CliError(`--pin takes <form>=<file>, e.g. --pin "Newsletter=src/components/FooterSection.astro". See --help.`);
+      }
+      const form = raw.slice(0, at);
+      if (Object.hasOwn(args.pins, form)) throw new CliError(`--pin ${form} twice: give one file. See --help.`);
+      args.pins[form] = raw.slice(at + 1);
     } else if (arg === "--xray") args.xray = argv[++i];
     else if (arg === "--plan") args.plan = argv[++i];
     else if (arg === "--copy") {
@@ -10029,6 +10090,9 @@ async function main() {
   if (args.forms && args.componentize) {
     throw new CliError("--forms and --componentize are separate runs. Do one, then the other. See --help.");
   }
+  if (Object.keys(args.pins).length > 0 && !args.forms) {
+    throw new CliError("--pin only means something with --forms. See --help.");
+  }
   const root = resolve(args.root);
   const brief = JSON.parse(await readFile(resolve(args.brief), "utf-8"));
   if (!Array.isArray(brief.pages)) {
@@ -10069,9 +10133,6 @@ async function main() {
     reportSections(files2, receipt2, args.dryRun);
     return args.strict && receipt2.sections.pending.length > 0 ? 2 : 0;
   }
-  if (Object.keys(args.pins).length > 0 && !args.forms) {
-    throw new CliError("--pin only means something with --forms. See --help.");
-  }
   if (args.forms) {
     const { files: files2, receipt: receipt2 } = await wireForms(brief, sources, { pins: args.pins });
     await written(files2);