@bettercms-ai/convert 0.16.0 → 0.16.1

package/dist/index.js

@@ -6531,32 +6531,33 @@ async function wireForms(briefIn, sources, options_ = {}) {
   }
   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 [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));
-  }
-  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 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);
@@ -6572,7 +6573,7 @@ async function wireForms(briefIn, sources, options_ = {}) {
         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>".`
+        `${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;
     }
@@ -6636,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) {