@bettercms-ai/convert 0.15.0 → 0.16.1

package/dist/index.d.ts

@@ -990,7 +990,11 @@ declare const FORM_SCRIPT = "<script>\nfunction bcmsPhone(cc,raw,trunk){var d=St
  * `ConversionReceipt` with an empty path arithmetic and the lane's own account under `forms`, so
  * `submit_conversion_receipt` takes it unchanged — the server's invariant reads `paths` only.
  */
-declare function wireForms(briefIn: Brief, sources: SourceFile[]): Promise<{
+interface WireFormsOptions {
+    /** Form id or name → the file its `<form>` is in. The operator's answer to FORM_AMBIGUOUS. */
+    pins?: Record<string, string>;
+}
+declare function wireForms(briefIn: Brief, sources: SourceFile[], options_?: WireFormsOptions): Promise<{
     files: PlanFile[];
     receipt: ConversionReceipt;
 }>;

package/dist/index.js

@@ -6493,7 +6493,7 @@ function wire(source, candidate, form) {
     source.appendLeft(el.inner.end - tail.length, `${tail || "\n"}${messageFor(dialect)}`);
   }
 }
-async function wireForms(briefIn, sources) {
+async function wireForms(briefIn, sources, options_ = {}) {
   const brief = readBrief(briefIn);
   const forms = brief.forms ?? [];
   const candidates = [];
@@ -6531,7 +6531,34 @@ async function wireForms(briefIn, sources) {
   }
   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 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);
+  }
+  for (const [id, file] of pinned) {
+    options.set(id, options.get(id).filter((c) => samePath(c.file, file)));
+    for (const other of forms) {
+      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;
+    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 });
+  }
   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 = [];
@@ -6542,7 +6569,12 @@ async function wireForms(briefIn, sources) {
   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(", ")}.`);
+      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>".`}`
+      );
       continue;
     }
     if (list.length === 1 && (wanted.get(list[0]) ?? 0) > 1) {
@@ -6551,7 +6583,13 @@ async function wireForms(briefIn, sources) {
     }
     if (list.length === 0) {
       const [best] = candidates.map((c) => ({ c, n: holds(c, form) })).filter((x) => x.n > 0).sort((a, b) => b.n - a.n);
-      if (best) {
+      const pin = pinned.get(form.id);
+      if (pin) {
+        pend2(form, "FORM_NOT_IN_SOURCE", pin, `the pinned file has no <form> posting ${form.fields.map((f) => f.key).join(", ")}.`);
+      } else if (best && best.n === form.fields.length) {
+        const owner = forms.find((f) => f !== form && options.get(f.id).includes(best.c));
+        pend2(form, "FORM_NOT_IN_SOURCE", best.c.file, `the only <form> posting ${form.fields.map((f) => f.key).join(", ")} is "${owner?.name ?? "another form"}"'s.`);
+      } else if (best) {
         const missing = form.fields.filter((f) => !best.c.controls.has(f.key)).map((f) => f.key);
         pend2(form, "FIELD_UNMATCHED", best.c.file, `no control posts ${missing.join(", ")} in the <form> that posts its other fields.`);
       } else if (unreadable[0]) {
@@ -6599,6 +6637,14 @@ ${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.`
+      );
+    }
+  }
   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) {