@bettercms-ai/convert 0.16.0 → 0.17.0

package/dist/index.d.ts

@@ -114,6 +114,13 @@ interface BriefForm {
         key: string;
         type: string;
     }[];
+    /**
+     * Where the built form sat — footer, header, nav, main, aside, dialog or body. Breaks the tie
+     * between several source `<form>`s posting exactly these fields. @see forms.ts
+     */
+    landmark?: string;
+    /** The owner's answer to FORM_AMBIGUOUS: the file this form is in. Applied like `--pin`. */
+    pin?: string;
 }
 
 /**
@@ -431,6 +438,8 @@ interface PendingForm {
     file?: string;
     /** What exactly could not be done. Informative; the reason is the contract. */
     message?: string;
+    /** FORM_AMBIGUOUS only: the files that each post every field — what a person picks from. */
+    candidates?: string[];
 }
 interface FormsReceipt {
     /** A `<form>` this run pointed at the CMS: action, method, id, field markers and the script. */

package/dist/index.js

@@ -6387,6 +6387,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") {
@@ -6401,8 +6402,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();
@@ -6439,7 +6460,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();
@@ -6474,14 +6495,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) {
@@ -6525,38 +6553,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);
@@ -6568,12 +6609,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) {
@@ -6611,7 +6653,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;
@@ -6636,6 +6678,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) {