@bettercms-ai/convert 0.14.0 → 0.16.0

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

@@ -6401,9 +6401,11 @@ function* elementsIn(nodes) {
 var childElements = (node) => node.children.flatMap(
   (child) => child.type === "element" ? [child] : child.type === "expr" ? childElements(child) : []
 );
-function candidateOf(file, dialect, form) {
+var isComponentTag = (dialect, tag) => dialect !== "html" && /^[A-Z]/.test(tag);
+function candidateOf(file, dialect, form, imported) {
   const controls = /* @__PURE__ */ new Map();
   const wrapper = /* @__PURE__ */ new Map();
+  const foreign = /* @__PURE__ */ new Set();
   const all = [];
   const walk = (parent) => {
     const own = [];
@@ -6411,6 +6413,17 @@ function candidateOf(file, dialect, form) {
       if (CONTROLS.has(child.tag.toLowerCase())) {
         own.push(child);
         all.push(child);
+      } else if (isComponentTag(dialect, child.tag)) {
+        const inFile = attrOf(child, "name") ? [] : imported.get(child.tag) ?? [];
+        if (inFile.length) {
+          for (const control of inFile) {
+            all.push(control);
+            foreign.add(control);
+          }
+        } else if (attrOf(child, "name") ?? attrOf(child, "id")) {
+          own.push(child);
+          all.push(child);
+        }
       }
       walk(child);
     }
@@ -6422,10 +6435,32 @@ function candidateOf(file, dialect, form) {
     if (name && !controls.has(name)) controls.set(name, control);
   }
   for (const control of all) {
+    if (foreign.has(control)) continue;
     const id = attrOf(control, "id")?.value;
     if (id && !controls.has(id)) controls.set(id, control);
   }
-  return { file, dialect, el: form, controls, wrapper };
+  return { file, dialect, el: form, controls, wrapper, foreign };
+}
+async function importedControls(source, parsed, dialect, project, cache) {
+  const out = /* @__PURE__ */ new Map();
+  for (const [local, { specifier }] of importsIn(parsed, dialect)) {
+    const path = resolveSpecifier(source.path, specifier, project.files, project.aliases);
+    const child = path === null || path === source.path ? void 0 : project.byPath.get(path);
+    if (!child) continue;
+    let controls = cache.get(child.path);
+    if (!controls) {
+      controls = (async () => {
+        const own = dialectOf(child.path, child.content);
+        if (!own || !WIRABLE.includes(own)) return [];
+        const file = await parseFile4(own, child.content);
+        return file.error ? [] : [...elementsIn(file.roots)].filter((el) => CONTROLS.has(el.tag.toLowerCase()));
+      })();
+      cache.set(child.path, controls);
+    }
+    const found = await controls;
+    if (found.length) out.set(local, found);
+  }
+  return out;
 }
 var hasMessage = (form) => [...elementsIn([form])].some((el) => (attrOf(el, "class") ?? attrOf(el, "classname"))?.value.includes("bcms-form-msg") ?? false);
 function wire(source, candidate, form) {
@@ -6444,6 +6479,7 @@ function wire(source, candidate, form) {
   source.appendLeft(el.attrInsertAt, ` ${inserts.join(" ")}`);
   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)}"`);
     const name = attrOf(control, "name");
@@ -6457,11 +6493,17 @@ 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 = [];
   const unreadable = [];
+  const componentFiles = /* @__PURE__ */ new Map();
+  const project = {
+    byPath: new Map(sources.map((s) => [s.path, s])),
+    files: new Set(sources.map((s) => s.path)),
+    aliases: aliasesFrom(sources)
+  };
   for (const source of sources) {
     if (!/<form[\s/>]/i.test(source.content)) continue;
     const dialect = dialectOf(source.path, source.content);
@@ -6482,13 +6524,40 @@ async function wireForms(briefIn, sources) {
       });
       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));
+      if (el.tag.toLowerCase() === "form") candidates.push(candidateOf(source.path, dialect, el, imported));
     }
   }
   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.`);
+    pinned.set(form.id, file);
+    options.set(form.id, options.get(form.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)));
+    }
+  }
+  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 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 = [];
@@ -6499,7 +6568,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(", ")}. Name the right one with --pin "${form.name}=<file>".`
+      );
       continue;
     }
     if (list.length === 1 && (wanted.get(list[0]) ?? 0) > 1) {
@@ -6508,7 +6582,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]) {
@@ -6556,6 +6636,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 keys = form.fields.filter((field) => candidate.foreign.has(candidate.controls.get(field.key))).map((field) => field.key);
+    if (keys.length > 0) {
+      notes.push(
+        `form ${form.name}: ${keys.join(", ")} matched a control inside an imported component, so no data-bcms-form-field marker was written for ${keys.length === 1 ? "it" : "them"}.`
+      );
+    }
+  }
   return {
     files,
     receipt: {